add a bunch of new stuff
Merge branch 'master' of https://github.com/Stonelinks/stonelinks.github.io

Conflicts:
	bower.json