Changed the README.md to encourage forking and pull requests
Added the ability to store sessions in a distributed system like Redis.
Merge pull request #2 from davidcoallier/distributed-sessions

Added the ability to store sessions in a distributed system like Redis.
Added future additions and corrected grammatical errors in README
fix in database.php, added .htaccess and updated README with local deployment settings
README Cleanup
Merge pull request #9 from karbassi/patch-1

README Cleanup
Improved spelling in README.md
- Sorted Dojo list by Country Code (ASC) and Dojo Name (ASC).
Rel. Issue #16
schema.sql
- Added table "countries" to database, used to translate the Country Codes
  into Country Names.

application/models/dojo_model.php
- Replaced original query, which just returned all rows from "dojos"
  table, with a query joining such table with the new "countries" table.
  The new query now returns a Country Name, which is also used for sorting
  the entries.

application/views/dojo/dojo.php
- Removed array $_countries, as the data it contained is now stored into
  the database.
- Modified loop that shows the Dojos so that it takes the Country Name
  from the new query added to the dojo_model.
- Simplified the "if" statement, by removing the "else", which was not
  really needed.
Merge pull request #15 from daigo75/master

Issue #7 and #16 - Dojo sort criteria
Go into more detail on setting up mysql
Document setting up apache
Use DocumentRoot, Zen needs to run at /
Make a nice code block for the example apache config
Add 'AllowOverride All' to enable .htaccess
Merge branch 'setupdocs' of https://github.com/raboof/Zen into raboof-setupdocs

Conflicts:
	README.md
	application/config/database.php
	application/models/dojo_model.php
	application/views/dojo/dojo.php
	index.php
	schema.sql