guilt
Merge branch 'master' of https://github.com/stanleytang/cs247chillbear

Conflicts:
	YourDay/Podfile
	YourDay/Podfile.lock