MAJ
Merge branch 'master' of https://github.com/BTS-SIO1-2014/BaseProg

Conflicts:
	README.md