Merge branches 'dev' and 'master' into dev
Merge branches 'master' and 'dev'
Added the fixtures data.
Changed the controller template for the generate.
Added to the API to add a score report.
Added the Twitter bootstrap.