main redesign and some formating changes -running off old database setup because of pg errors
Merge pull request #1 from lucasjmoore/master

main redesign and some formating changes