Readded files after accidentally removing
Cleaned up sql
Merge pull request #33 from johnmannpaul/master

pulling updated files from master