Merge branch 'master' of https://github.com/Joelgullander/Kodapor

Conflicts:
index.html
js/app.js
Merge branch 'master' of https://github.com/Joelgullander/Kodapor

Conflicts:
	index.html