Merge branch 'release/v1.1.2' into develop
Merge branch 'master' of github.com:Ninju/alexwatt.org into develop
Updated version number to '1.1.3'
Merge branch 'develop' into hotfix/v1.1.3
Refactoring Coffeescript
Merge branch 'hotfix/v1.1.3'