Git ignore target
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
change database username
Merge pull request #368 from katiewood/master

change database username