Merge branch 'master' of https://github.com/tracek/MIPs

Conflicts:
	mips.R
Merge branch 'master' of https://github.com/tracek/MIPs