Add all
Merge branch 'master' of github.com:piotrholubowicz/havok

Conflicts:
	.gitignore