preliminary storyline stuff!
Merge branch 'origin/master'
started work on storyline service

buttons don't work-- this needs a good bug fix / refactor (maybe not SCE)
storyline modals wip
storyline modals work a bit better and are styled closer to the tumblr aesthetic
ui adjustments
CSS class reorganization and modal styling
changed gifs to be an option rather than a type, and added a few more story bubbles
Merge branch 'master'

Conflicts:
	bower.json
	gulpfile.js
	src/app/app.coffee
	src/app/rounds/controllers/end.coffee
	src/app/rounds/controllers/round.coffee
	src/app/rounds/rounds.coffee
	src/app/rounds/views/end.tpl.html
refactor for flexibility wip
Merge branch 'origin/master'

Conflicts:
	src/app/rounds/controllers/round.coffee
	src/app/rounds/rounds.coffee
storyline refactor wip
Merge branch 'origin/master'

Conflicts:
	build/src/templates.js
	src/app/rounds/views/end.tpl.html
refactor again... changed class organization.
added the word "left" to the countdown
Merge branch 'master'

Conflicts:
	bower.json
	build/src/app/rounds/controllers/end.js
	build/src/app/rounds/controllers/round.js
	build/src/app/rounds/rounds.js
	build/src/templates.js
	build/style/app.css
	build/style/app.css.map
	src/app/rounds/controllers/end.coffee
	src/style/app.scss
more ui adjustments
home screen is rewritten and restyled
redid story controller to be its own state rather than ngdialog
preload images in story controller (so fast)