backend_milestone
GIT IGNORE
BOOOM USERS CHANGE
changing UI, bootstrap theme, adding thumbnails, adding user profile pills
reconciling differences between branches
fixing bugs and merging with master