Merge pull request #18 from zephyrz4/master

derp
Made a Text field failed on test. THIS IS A BROKEN BUILD.
Work on login system
Merge remote-tracking branch 'upstream/master'