bjdka
Merge branch 'master' of github.com:safirerose879/pd2-final-FLo-ELou

Conflicts:
	Log.md
Something weird happened