Initial repo
changed configutations
added lock
added pg to gemfile
added lock file
moved to rails 3 2 13
full screen maps
added popup content
Merge branch 'master' of github.com:murtuzakz/mapped-conferences