basic functionality (the base for development)
Merge branch 'master' of github.com:scottbea/shingle

Conflicts:
	package.json