still cleaning up
Merge branch 'master' of https://github.com/LIL717/30-Second-Habit

Conflicts:
	.DS_Store
	.gitignore
	30 Second Habit/.DS_Store