Cleaned up code style
Moved old index to old_website
fixed up old express code
Merge remote-tracking branch 'upstream/master'
Merge pull request #3 from granttimmerman/master

Merging with master