Adding lobby.html and lobby.scss
Merge branch 'master' of https://github.com/pencilcheck/PvP

Conflicts:
	app/scripts/app.js
	app/scripts/controllers/login.js
	app/styles/main.scss