work on creating a new hackathon
added ability to create team when adding hackathon
added geocoder
commented out new hackathon js
Merge pull request #20 from andrewcallahan/hackathon-show

wireframe
fix to new hackathon
fix merge conflicts
Merge branch 'eugene_work_fix' into eugene_work
Merge pull request #21 from andrewcallahan/eugene_work

Eugene work
Added pg adapter gem
css bug fix
added project field to teams. added ability to insert project on creation of team, although optional
Merge pull request #22 from andrewcallahan/teamproject

project description for teams
merge conflict