added upper case display of message
Merge branch 'dev'
ignore PHPstorm settings folder
Merge branch 'master' into dev
Merge branch 'dev'
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.php
initial commit
Merge pull request #7 from amsterdamhackathon/dev

Dev