api working
Merge branch 'master' into ui
acceptance tests
resolved conflicts
merged design into master branch
added caption to package json
meme making completed
fixed grunt issue
edited meme model
merged frmo master
fixed some merge issues
fixed some more merge issues
added width and height to meme create
to pull from master
added logout functionality
Merge branch 'ui'
fixed merge conflicts