Jordan Update
Jordan's final update
Merge branch 'master' of github.com:makersacademy/student-directory

Conflicts:
	README
Merge branch 'master' of github.com:makersacademy/student-directory

Conflicts:
	README