Changed dialog, fixed bugs and added a combo system
Merge branch 'master' of https://github.com/kevinmcree/My-Fair-Lady-2

Conflicts:
	Assets/Main Game.unity