Update file for coding style
Use settings from settings file
Merge pull request #1 from texasjoshua/master

Demo for using git/github