first commit
Merge branch 'master' of github.com:nickelser/shrug

Conflicts:
	README.md