trying to create a branch
Merge branch 'master' of https://github.com/jmwhyte/Osaka_SMB_2014

Conflicts:
	README.md
change to testing branch