Updated for presentation
Merge remote-tracking branch 'origin/master'

Conflicts:
	assets/js/app.js
	assets/js/loops.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	assets/js/app.js
	assets/js/loops.js