Forced commit
Merge branch 'master' of https://github.com/aarondewindt/AOBS

Conflicts:
	AOBS/MatlabCompile.asv
Revert "Merge branch 'master' of https://github.com/aarondewindt/AOBS"

This reverts commit a10ec257c4f1a624df504264a5be747ec1630e5f.
Merge branch 'master' of https://github.com/aarondewindt/AOBS

Conflicts:
	.gitignore
	AOBS/MatlabCompile.asv
	AOBS/MatlabCompile.m
	AOBS/SOI.mexw64
	Matlab/IP AOBS test/SOI.mexw64