Maj
Merge branch 'master' of https://github.com/BTS-SIO2-2013/EXAM

Conflicts:
	resume.csv