Merge pull request #3 from ZooTypers/master

oull
Merge pull request #4 from ZooTypers/master

oull
Merge pull request #5 from ZooTypers/master

pull
Merge pull request #6 from ZooTypers/master

pull
fixed login bug, made new login screen, etc
Merge pull request #126 from littlpunk/master

push