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
removing race condition thanks tlicata
Merge branch 'gh-pages' of https://github.com/jennz0r/wasteland into gh-pages

Conflicts:
	index.html