Initial commit
Merge branch 'master' of github.com:seece/ohtu2014b

Conflicts:
	LICENSE