Preparing for 2015
24 -> 38 hours
Added Shannon to contact page
Updated will's email
fixed footer on contact us page
Added Jacob to contacts.
Updated tests (still not passing) and syncing.
Updated tests (still not passing) and syncing heroku with github.
fixed merg issues.