Initial commit
finished the front-end, finished integration tests
Merge branch 'master' of github.com:wbennett/sharpy

Conflicts:
	.gitignore