6 commits

Author	SHA1	Message	Date
Jeremy Kauffman	950f3183cf	more bug fixes + optimizations	2017-05-12 14:36:44 -04:00
Jeremy Kauffman	5605b10f54	more bug fixes and bugs	2017-05-12 13:14:06 -04:00
Jeremy Kauffman	c1161fc10b	mainly more bug fixes	2017-05-11 19:28:43 -04:00
6ea86b96	daabe975e1	Add showPage again. Not 100% sure if it's needed?	2017-05-05 13:13:06 +07:00
6ea86b96	ac626ab9f9	File page working	2017-05-05 12:10:37 +07:00
Jeremy Kauffman	36a992343f	much progress towards a working merge	2017-05-03 23:44:08 -04:00