Ignore Project Files
Changes to Lab1P1
Merge branch 'dev'

Conflicts:
	lab1p1.c
Some cleanup