Adding pages
Merge branch 'master' into gh-pages

Conflicts:
	src/main/webapp/app/index.html
	src/main/webapp/app/js/controllers/HomeController.js
	src/main/webapp/app/js/services/HomeService.js
	src/main/webapp/index.html
	src/main/webapp/slides/2014.html
	src/main/webapp/slides/js/extensions/goto/deck.goto.html
	src/main/webapp/slides/js/extensions/hash/deck.hash.html
	src/main/webapp/slides/js/plugins/codemirror/mode/php/index.html
Creating slides.
Merge branch 'master' into gh-pages

Conflicts:
	src/main/webapp/slides/2014.html
Merge branch 'master' into gh-pages

Conflicts:
	src/main/webapp/slides/2014.html
Creating slides.