linker error

linker error
Merge branch 'master' of https://github.com/skhan18/Providence

Conflicts:
	.DS_Store