add karibronson to students.txt file
.gitconfig info in a .txt file
Merge branch 'master' of https://github.com/karibronson/395lab into karibronson-fix

Conflicts:
	students.txt