Added my name
resolvec onflict
resolved conflict
empty README
Merge branch 'master' of https://github.com/makersacademy/student-directory

Conflicts:
	README