I don't please why
Merge branch 'master' of http://github.com/ethanmn/CPE476Final
It shouldn't have changed
I lied I forgot something. NOW should be fine.

Merge branch 'master' of http://github.com/ethanmn/CPE476Final

Conflicts:
	src/day_night_interaction.h
added rain button