deleted extra test folder again
fixed jshint and jscs errors
added Travis tag
replaced api key
Merge branch 'master' of https://github.com/Chareesa/IsTheWeatherGood-App into newBranch
changed key in server.js