Finish..?
Merge branch 'master' of https://github.com/sasilukr/feedmefeedback

Conflicts:
	public/js/feedmefeedback.js