Merge pull request #1 from chriscct7/dev

test push dev to master
Merge pull request #2 from chriscct7/dev

test 2
Code Formatting and Various Other Changes.
Change filename
Remove old file
Merge pull request #3 from sunnyratilal/master

Changes and Code Formatting
Merge pull request #4 from chriscct7/master

Pull #3 in to dev