Removed the .DS_Store files that were from my computer
Merge branch 'master' of https://github.com/erichydrick/campusnavigator