Cleaned up Repo
Merge branch 'master' of https://github.com/kvolle/Summer-Work-2014.git