modal closes when clicked on
Mergin in Dan's clip.

Merge branch 'master' into modal-close-form
swiping on mobile for voting implemented
Merge branch 'master' into swipe_on_phones
getting latest master
The text boxes have been added
pending, error, and success handling for uploading flip completed
merged
fixed buggy no clip show error
 Finished the pop up for like and dislike
Merge pull request #55 from red-admirals-2014/modal-close-form

Modal close form
Merge pull request #56 from red-admirals-2014/swipe_on_phones

swiping on mobile for voting implemented
Pulling latest merge in master and merging with changes added to  upload handling
Merge branch 'master' of https://github.com/red-admirals-2014/Stage-Fright into swipe-merge-upload-handling
Fixed the console logs
Merging master branch with local copy

Merge branch 'master' into vote_has_been_accepted
merged with most current swipe add on
Merge pull request #59 from red-admirals-2014/swipe-merge-upload-handling

Swipe merge upload handling
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
fixing merge conflict for stylesheets - kept everything