Add branching strategy to the mix
Merge branch 'master' of https://github.com/bdeanindy/RattleCan

Conflicts:
	docs/developmentApproach.markdown