login
Merge branch 'master' of github.com:EpokK/epokk.github.io

Conflicts:
	javascripts/main.js
	views/login.html