removed tagging
Merge branch 'master' of github.com:Klopsch/finalproject
Merge branch 'master', remote-tracking branch 'origin' into lacoste
Fix for profile view
Merge branch 'master', remote-tracking branch 'origin' into lacoste