testcomment andy - merge test
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/application_controller.rb
gitignore .idea directory
--- blablabla comment for merge test ---
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/application_controller.rb
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
adjusting routes.rb Projectname