feature wip: preloading images
feature: preloading is working
update these tests
update the build
Merge branch 'origin/preloading'

Conflicts:
	build/src/app/app.js
	build/src/app/common/tags.js
	build/src/app/rounds/controllers/round.js
	build/src/app/rounds/rounds.js
forgot to recommit minification
typo fix
update tags, commit minification
my brother asked me to add mecha tags
use a thumbnail instead of the original image; hopefully this is faster?
Merge branch 'origin/master'

Conflicts:
	src/app/rounds/controllers/round.coffee
	src/app/rounds/rounds.coffee
storyline refactor wip
fix: change to ng-src instead of src to prevent error messages
Merge branch 'origin/master'

Conflicts:
	build/src/templates.js
	src/app/rounds/views/end.tpl.html
refactor again... changed class organization.