testing4
Merge branch 'master' of https://github.com/zezantam/gsp13-eighty-days

Conflicts:
	config/application.yml