This is my first check in.
fixed conflict stuff.
Merge branch 'master' of https://github.com/smurfsky101/gitworkshop