before merge
Merge branch 'master' of github.com:Lincolnnus/Remindy

Conflicts:
	Remindy/.DS_Store