* more progress
more and more
more and more and more
* added gitignore
Merge branch 'master' into gh-pages

Conflicts:
	.gitignore