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
Fixed conflicts
Merge pull request #82 from JoshFB/projectPage2

Project page2