Added servers
Merge branch 'master' of https://github.com/mpdavis/vinz into frontend_prototype

Conflicts:
	app/templates/index.html
no message
Merge branch 'master' of https://github.com/mpdavis/vinz into frontend_prototype
Merge branch 'master' of https://github.com/mpdavis/vinz into frontend_prototype
Merge pull request #50 from jacobhummel/frontend_prototype

Frontend prototype