cleaned up some code
Merge branch 'master' of github.com:tmuntan1/cavy

Conflicts:
	.gitignore
switched back