Adding something
Updated...
Merged
Added something...
???
Merge branch 'testing'

Conflicts:
	Test2.py
Merge branch 'master' of https://github.com/corrieelston/MoodRecorder

Conflicts:
	Test2.py