Initial Commit
Merge branch 'gh-pages'

Conflicts:
	src/main.js