Merge branch 'master' of https://github.com/ie-ModelingAndDesign/2014-D

Conflicts:
	README.me