initial commit
Merge branch 'master' of https://github.com/alexshepard/spimr

Conflicts:
	.gitignore