Post Joomla install

I have now installed Joomla 3.3.6. The settings are for local
development at the moment.

I came across one problem during the installation and that was that
Joomla got stuck while creating the tables for the database but this was
resolved by reading:

http://stackoverflow.com/questions/21510660/joomla-3-installation-freezes-at-creating-database-table

	new file:   database-backup.sql
Merge remote-tracking branch 'origin/master'