Removed Location momentarily
Merge branch 'master' of github.com:fayeli/WildHacks2k14