android stuff
Merge pull request #3 from piixelize/master

updated tagline
Merge pull request #4 from jamur2/master

android stuff
add users
check for user
update front end