added TravisCI Integration
remove travisCI config
add Jenkins build status
add Gemfile.lock to repo for heroku deployment
app #1 - confirmed weather widget
fix merge conflict
Merge branch 'kevinnathanael-master'