initial commit of solution
Merge branch 'master' of https://github.com/balbertGit/TDIDMay2014

Conflicts:
	.gitignore