ignore PHPStorm files
Merge pull request #11 from aequasi/master

adding core laravel files
Merge pull request #12 from mhenningsd/master

Ignore PHPStorm files
Merge pull request #15 from aequasi/master

Fixing public directory
Removed duplicate file
ignore generated files
aequasi merge
Merge pull request #17 from ibiwan/master

added a .gitignore to keep generated files from showing up in diffs
aequasi merge
rename database.php to database.php.inc
rename database.php to database.php.inc
Merge pull request #19 from aequasi/master

Adding a view helper.
fixed merge conflict
Merge pull request #20 from aequasi/master

Adding codehelp file
Re added README
Merge branch 'master' of ssh://github.com/sdphp/grouptopics.org
Merge pull request #21 from aequasi/master

Adding twitter bootstrap
create users table
Merge pull request #22 from mhenningsd/master

Create Users table through laravel migrations
Merge pull request #23 from aequasi/master

Adding css overrides file