initial commit
proba
Merge branch 'master' of https://github.com/tilius/io-article-manager

Conflicts:
	app/controllers/Application.scala
Merge branch 'master' of https://github.com/tilius/io-article-manager