working on css, login, registration
stuff
acceptance tests
resolved conflicts
merged design into master branch
added caption to package json
edited meme model
fixed some merge issues
fixed some more merge issues