Updated README with new features
Updated README with new features
Merge branch 'master' of github.com:mgarbacz/brunch-with-cowboys

Conflicts:
	README.md
Updated README with new features with correct formatting