Last Commit
Merge branch 'master' of https://github.com/bethanyprevatt/wsp

Conflicts:
	.DS_Store