changed greeting to hi edward
Merge branch 'master' of https://github.com/dagumak/playground

Conflicts:
	HelloMatt.txt
Revert "changed greeting to hi edward"

This reverts commit ef0c2d7120abe02a2b972c560e411f863f09e67c.

Conflicts:
	HelloMatt.txt