api working
Merge branch 'master' into ui
meme making completed
fixed grunt issue
merged frmo master
fixed some merge issues
fixed some more merge issues
to pull from master
added logout functionality
Merge branch 'ui'