Added tkinter
Merge branch 'master' of git://github.com/Chuphay/Hello-World
made it 2.7 compatible
Merge branch 'tp9-master'
Added a list of names to use
i made an empty text file
Merge branch 'master' of https://github.com/Chuphay/Hello-World
Merge branch 'master' of https://github.com/tp9/Hello-World into tp9-master
Merge branch 'tp9-master'
something to roll backon
confused
try that again
Merge branch 'master' of https://github.com/Chuphay/Hello-World
weird
Revert "try that again"

This reverts commit e05ca6848fdd95dd4d9d60eee004c5a71ee1c925.
Merge branch 'master' of https://github.com/SplashDance/Hello-World-1 into SplashDance-master

Conflicts:
	hello.py
maybe...
Merge branch 'SplashDance-master'