Pop up window
Merge branch 'master' of https://github.com/jeche/dehackathon2

Conflicts:
	views/index.html
Merge pull request #3 from otorres86/master

Pop up window