PCS-Javascript-Junkies/Capstone-Project — pull request #41 by CrouseMatthew (2014-08-25 22:06:57+00:00)
Title: Crouse matthew

Merge conflict. but updated default image