adding footer
finalized crash party button
1st attemp to merge my branch with dev
fixed more merge conflicts
fixesd confict in index.html.erb
Merge branch 'jbranch' into dev
index page changes for team to use for merge
rearranging index page, adding thumbs up thumbs down
after reset, commiting unstaged changes so i can merge in working keithfeature branch
commiting changes after fixing conflicts with the merge from keithfeature
added :age, :name to user model because they suddenly and inexplicably went missing....
more minor css changes
Fixed crash button bug
finally fixed the maps
added custom images code for google maps....disabled by default
Merge branch 'dev' of https://github.com/odesey/PartyCrashers into dev

Conflicts:
	app/assets/stylesheets/application.css
	app/assets/stylesheets/parties.css.scss
	app/models/party.rb
	app/views/layouts/application.html.erb
	app/views/parties/index.html.erb
fixing buggy css, page renders, signin works
minor chages to merge in keithfeature branch
Merge branch 'keithfeature' into dev

Conflicts:
	app/assets/stylesheets/application.css
	app/assets/stylesheets/parties.css.scss
	app/views/layouts/application.html.erb
	app/views/parties/index.html.erb
readding search box, floats right