Merge conflict
Merge branch 'connienguyen'

Conflicts:
	Assets/Scenes/EasyLevels.unity