changed static assets production
changed back static assets
Heroku fix hopefully
figuring out less problem
Merge branch 'master' of github.com:vaughanj10/TeamSynergy
fixing merge conflicts
removed menu items from nav
merged conflicts