Swap delete
Merge branch 'master' of https://github.com/lowmanb94/lab1

Conflicts:
	inlab/.TestLifeCycle.cpp.swp
Deleting corrupted swap
Deleted a.out