hopefully removed database.php from version control
Merge branch 'master' of github.com:nickhentschel/sandbox-swipe-system