Initial commit
Merge branch 'master' of https://github.com/rmansfeld/wm2014

Conflicts:
	.gitignore