add username and date to post
Merge branch 'master' of https://github.com/Tranquility/studentsonrails-weihnachtsmann

Conflicts:
	db/schema.rb