cleaned up some code
Merge branch 'master' of https://github.com/nlujan/Capture

Conflicts:
	.DS_Store