Deleting To See if I can't Pull...
Merge branch 'master' of https://github.com/nklose/CMPUT302.git

Conflicts:
	PhonemeFrenzy/assets/Phoneme Sounds/a.wav
	PhonemeFrenzy/assets/Phoneme Sounds/an.wav
	PhonemeFrenzy/assets/Phoneme Sounds/b.wav
	PhonemeFrenzy/assets/Phoneme Sounds/ch.wav
	PhonemeFrenzy/assets/Phoneme Sounds/d.wav
	PhonemeFrenzy/assets/Phoneme Sounds/e.wav
	PhonemeFrenzy/assets/Phoneme Sounds/e_acute.wav
	PhonemeFrenzy/assets/Phoneme Sounds/e_grave.wav
	PhonemeFrenzy/assets/Phoneme Sounds/eu.wav
	PhonemeFrenzy/assets/Phoneme Sounds/f.wav
	PhonemeFrenzy/assets/Phoneme Sounds/g.wav
	PhonemeFrenzy/assets/Phoneme Sounds/gn.wav
	PhonemeFrenzy/assets/Phoneme Sounds/i.wav
	PhonemeFrenzy/assets/Phoneme Sounds/ill.wav
	PhonemeFrenzy/assets/Phoneme Sounds/in.wav
	PhonemeFrenzy/assets/Phoneme Sounds/j.wav
	PhonemeFrenzy/assets/Phoneme Sounds/k.wav
	PhonemeFrenzy/assets/Phoneme Sounds/l.wav
	PhonemeFrenzy/assets/Phoneme Sounds/m.wav
	PhonemeFrenzy/assets/Phoneme Sounds/n.wav
	PhonemeFrenzy/assets/Phoneme Sounds/o.wav
	PhonemeFrenzy/assets/Phoneme Sounds/oi.wav
	PhonemeFrenzy/assets/Phoneme Sounds/on.wav
	PhonemeFrenzy/assets/Phoneme Sounds/ou.wav
	PhonemeFrenzy/assets/Phoneme Sounds/p.wav
	PhonemeFrenzy/assets/Phoneme Sounds/r.wav
	PhonemeFrenzy/assets/Phoneme Sounds/s.wav
	PhonemeFrenzy/assets/Phoneme Sounds/t.wav
	PhonemeFrenzy/assets/Phoneme Sounds/u.wav
	PhonemeFrenzy/assets/Phoneme Sounds/ui.wav
	PhonemeFrenzy/assets/Phoneme Sounds/un.wav
	PhonemeFrenzy/assets/Phoneme Sounds/v.wav
	PhonemeFrenzy/assets/Phoneme Sounds/z.wav
CAREFUL: It forced me to merge customization files that I didn't change.
I do no know if they are the way they should be...