Fix merge conflicts on projects page
Merge pull request #178 from ua-snap/projects

Fix merge conflicts on projects page