removing Alice file
A real mess of a merge
You are a genius
Merge branch 'master', remote branch 'origin/master'

Conflicts:
	Alice