nicks new change
Merge branch 'master' of github.com:bensmithbwd/bwmanager-beta

Conflicts:
	README.textile