Updated some logic for better development
Merge branch 'develop' of https://github.com/erier/quarters into develop

Conflicts:
	README.md