added basic stuff -ryan
Merge remote-tracking branch 'upstream/master'