Merge pull request #4 from blakeeasley/master

Pull4
Merge pull request #5 from blakeeasley/master

pull5
Fixed things
Fixed Thinsg
Things
Fixed files
Merge pull request #3 from yyttr3/master

pull7