Merge pull request #3 from suketk/master

Reformatted and fixed functionality
error handling for text boxes
merge and fancy button shit
merge
androidmanifest added
Merge pull request #6 from suketk/master

Can't come up with anything
bounds handling with toast notification, changed edittext hints
added stuff to factors class in parse
Even more dynamic UI