added login logout button
Merge branch 'master' of github.com:pellejacobs/Pennapps-Fall-2014

Conflicts:
	index.html
Merge branch 'master' of github.com:pellejacobs/Pennapps-Fall-2014