finishing map
fixed merge
finished maps
removed wrong tag file
removed wrong tag file
Merge branch 'master', remote-tracking branch 'origin' into lacoste
Newsfeed in correct order
fixed tests and removed unneeded avatar files
Merge branch 'master' of github.com:Klopsch/finalproject
cucumber stuff
Merge branch 'master', remote-tracking branch 'origin' into lacoste