Initialized repository with an empty Scala Play 2 Framework project
Merge branch 'master' of https://github.com/HackerSchool-IST/Passport

Conflicts:
	.gitignore