Merge pull request #93 from radicalsauce/master

Restructed server.js position, got repo ready for VM deploy
Fixed small route bug