working on projects page
getting ready to pull
need to resolve conflicts and pull from master
fixing project page merge conflicts
Merge branch 'merge_conflicts'