Adding license and grabbing in any old changes from bike commuter
Updating gitignore'
Merge branch 'bikersMode'
Fixing merge conflicts