fix database.php.inc
Merge pull request #25 from onema/master

Ideas migration file.
merge conflict
Merge pull request #26 from mhenningsd/master

fix database.php.inc
Merge pull request #27 from onema/master

Added migration file for idea_threads, tags, and idea_tags
Create README.md
Adding Setting Up Dev environment to readme
Capitalization consitency
Merge pull request #33 from johncongdon/Readme-update

Readme update
I wanted these sentences on different lines
Merge pull request #34 from johncongdon/FixREADME

I wanted these sentences on different lines
Adding javascript libraries and assetic files
Merge branch 'master' of git://github.com/sdphp/grouptopics.org
restructuring routes and finishing the login/logout logic
Merge pull request #35 from aequasi/master

Restructured routes and finished the login and logout logic
Adding hybrid auth stuff. Oauth
Merge pull request #37 from aequasi/master

Adding oauth knowing that aequasi left us in a buggy state...  ;-)  j/k, we can work through some of the small hurdles.
Changed directions for setting up database.php
Merge pull request #38 from johncongdon/master

Updated README file, I know I shouldn't merge my own stuff.  But come on, this was a simple README file change.  ;-)
Update README.md

Adding hybridauth