Merge pull request #8 from tylyan/master

Fixed merge conflicts/cleaned up code
Fixes new back-end for windows
account login front-end