Merge pull request #1 from designatednerd/master

Added files and fixed warnings
Shut up formatting warning.