#8 done
Merge branch 'master' of https://github.com/colitman/nc.edu.group8.lb4

Conflicts:
	.gitignore