Renamed some files, updated journal
Merge branch 'master' of https://github.com/Senior-Project-2013/Word-Bike-3D