Added Julian Martinez del Campo to the student list
first add/commit
fix conflict
Merge https://github.com/mdcja/395lab into mdcja-master

Conflicts:
	students.txt

Rescolve conflicts in mdcja's students.txt file