Takana work around
Merge branch 'master' into gh-pages

Conflicts:
	Build/index.html
	index.html
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages

Conflicts:
	Build/index.html
	Build/javascripts/application.js
	index.html
	javascripts/application.js
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages

Conflicts:
	Build/javascripts/application.js
	javascripts/application.js
Merge branch 'master' into gh-pages

Conflicts:
	Build/javascripts/application.js
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
fixing conflicts
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
gah icons
ya
...