asdfasdfs
Merge branch 'master' of https://github.com/gdepaul/Lab1

Conflicts:
	lab1p1.c
Fixed merge conflicts