will start styling login and other areas
Merge branch 'master' into john
added some styling to login
done with styling of login for now, maybe more upgrades later
Merge branch 'master' into john
Merge pull request #10 from alanflorendo/john

semi-styled login page, moving to other areas
fix merge conflict in css