commit
Merge branch 'master' of github.com:jhanschoo/circulare

Conflicts:
	.DS_Store