Updated the console, .gitignore, connection.rb and got a home map in mainMap.js
Trying to pull
Merge branch 'master' of github.com:WDI-Team-Geodude/piler
going to pull
Merge branch 'master' of github.com:WDI-Team-Geodude/piler
Merge pull request #24 from neener/master

testing/adding toggle
some changes in scripts file
some changes in scripts
Merge pull request #26 from shotarokamegai/master

soem changes in scripts
going to pull
going to pull
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
good copy
Merge pull request #29 from pateltejal9500/master

server update and javascript
good copy
Merge pull request #30 from pateltejal9500/master

good copy
Merge branch 'master' of https://github.com/WDI-Team-Geodude/piler

Conflicts:
	db/connection.rb
	public/javascripts/navscript.js
	public/javascripts/scripts.js
	public/styles/style.css
	server.rb