Merge pull request #70 from whoisglover/Re-implimenting_feedback

Feedback and views are working
Merge branch 'master' into Re-implimenting_feedback