creating new branch
Merge branch 'master' of github.com:JoshFB/Talent_Hacked_Code into frontEnd1
Pulling a newest version
Fixed conflicts
Need to pull
Merge branch 'master' of github.com:JoshFB/Talent_Hacked_Code into frontEnd1
Merge pull request #37 from JoshFB/frontEnd1

Front end1