changes to make pull
Merge remote-tracking branch 'upstream/master'
Feedback is done, there is only styling left
Merge pull request #6 from blaabjerg88/master

Feedback page is done