added admin panel stuff
all admin stuff didnt commit, adding again
changed fxn db constants back to production values
worked on styling & gmaps testing
Added some essential files
got first search part working, starting to add the rest of the data
the search bar is working with that ol' data
Got searchbar working better
Merge branch 'master' into networks
Readded gitignore
Fixed merge conflict with master
commit before pulling from repo
Fixing some strange merge issues
fixed minor issue with search
stuff I can't remember
started work, messed things up
Merge branch 'master' of https://github.com/culturemesh/culturemeshdevteam
changed gitignore to keep out annoying swap files
Merge branch 'master' into networks
Almost there