init
Merge branch 'gh-pages'

* gh-pages:
  no message
  init

Conflicts:
	.gitignore
	README.md
	bower.json
no message
Fixes #1
Merge branch 'master' into gh-pages

* master:
  Fixes #1
  no message
  init
Reverse gh-pages specific changes