change title
edited gitignore
Merge branch 'master' of https://github.com/salzheimer/Spring2014_CapstoneProject