fixing the last commit in master
commit to master from branch
fixing merge conflict
merged Bob's code into master
fixing merge break
Merge branch 'master' into josh
tweaks to login system
login page css updates