initial commit
we're good here
Merge branch 'master' of github.com:veryrobert/guidelines

doing a merge from my local
:wq
:wq
i doing a merge