Path
Fixed conflicts
Project page
Merge branch 'master' of github.com:JoshFB/Talent_Hacked_Code into projectPage2
fixing dashboard path
Merge branch 'master' of github.com:JoshFB/Talent_Hacked_Code into projectPage2
Merge branch 'master' of github.com:JoshFB/Talent_Hacked_Code into projectPage2
Fixed conflicts
Need to pull newest version
Fixed conflicts
Merge pull request #81 from JoshFB/profile_css_update

Profile css update
Fixed conflicts
Merge pull request #82 from JoshFB/projectPage2

Project page2
developer can accept or reject a project
fixed some bugs caused by merges
Merge pull request #83 from JoshFB/devAcceptReject

Dev accept reject
Pulling
Fixed conflicts
edit buttons fixed
Readd project boxes