adding banner for github
merge error with master
making Nate happy again
Merge pull request #1 from nyentek/connor_dev

Connor dev