first pages commit
Merge branch 'gh-pages' of http://github.com/digitalscientists/activitytrack into gh-pages

Conflicts:
	img/demo/3.PNG
asdf