just stuff
removed conflict copy
Merge branch 'master' of https://github.com/PCS-Javascript-Junkies/Capstone-Project
pre pull of master
Merge branch 'master' of https://github.com/PCS-Javascript-Junkies/Capstone-Project
 pre commit
Merge branch 'master' of https://github.com/PCS-Javascript-Junkies/Capstone-Project
push to heroku
Merge branch 'master' into crouseMatthew
added chll and night out brnach