Merge branch 'master' of https://github.com/goldingn/intecol2013

Conflicts:
	README.md
Merge branch 'master' of https://github.com/goldingn/intecol2013

Conflicts:
	README.md