updating stuff
Restructured, fixed server.js
Updated gitignore
Cleaning up, rebased with byron