added new file: yohanNewFile.txt
added kylefix2.py
changes done.
Merge pull request #3 from adelagon/yohanBranch

added new file: yohanNewFile.txt
Merge pull request #2 from adelagon/kyle

added kylefix2.py
Merge pull request #1 from adelagon/Celine

New
test conflict
Hehe
renamed Overview to Kyle
changed Overview to Tems
fixed conflict
resolve conflict
resolve conflict TEMS
Merge branch 'master' of https://github.com/adelagon/Emote

Conflicts:
	README
commiting README..yohan
ayos na daw conflict..
Merge branch 'master' of https://github.com/adelagon/Emote

Conflicts:
	README
Merge branch 'master' of https://github.com/adelagon/Emote

Conflicts:
	README
New