added span tag to meme score display, created three user tests for voting
added Filepicker.io upload logic to JS
resolved merge conflicts
added social twitter button with the social-share-button gem
added _meme_box partial for show/image/:id path
added a div for social buttons in _meme partial
finalised tests for user authorization methods
resolved merge conflicts; added bootstrap and flat-ui asset pipeline into images however it is not working out as expected
resolved merge conflict