Merge branch 'master' of github.com:WDI-Team-Geodude/piler
server fixed, and modals for votes and comments
updated server
server and js updates
Merge pull request #27 from DanielFarber/master

Hope this doesn't mess everyone else up
Merge branch 'master' of github.com:WDI-Team-Geodude/piler
good copy
Merge pull request #29 from pateltejal9500/master

server update and javascript
Merge branch 'master' of github.com:WDI-Team-Geodude/piler

Conflicts:
	public/javascripts/navscript.js
	public/javascripts/scripts.js
	views/index.erb
Code should be unscrewed, created branch