Initial commit to repo
Merge branch 'master' of https://github.com/schaffino/ESD2013

Conflicts:
	.gitignore