The text boxes have been added
 Finished the pop up for like and dislike
Fixed the console logs
Merging master branch with local copy

Merge branch 'master' into vote_has_been_accepted
fixed merge conflict with dan
removed a view test that kept breaking everything
Merge pull request #58 from red-admirals-2014/vote_has_been_accepted

Vote has been accepted