semi3
Merge branch 'master' of https://github.com/miyamott/miyamoto

Conflicts:
	functions.hs