my config
Merge remote-tracking branch 'upstream/master'
Modified master page. default.
Webpage (Focus now okay in Chrome)

Added tab index.
Merge pull request #10 from yeahimacerealkiller/master

Added tabindex.
Added database.php to .gitignore

Did this so we don't have to change our database passwords all the time.
Re-added database.php to .gitignore
.gitignore is now working
database.
Revert "Re-added database.php to .gitignore"

This reverts commit daa53861776ef34e84eb62cd79ca1c118eb30953.
Update readme.md
Update readme.md
Merge remote-tracking branch 'upstream/master' into carlavels-branch

Conflicts:
	app/config/database.php

Accepted or Committed to the relationship.
Recent edit at Readme.md
Deleting database.php in gitignore

-possible loss of database.php might occur if not deleted