Current master
Merge conflict
Git ignore updated for DS Store
Merge branch 'master' into bugfix
current
Merge branch 'bugfix' of github.com:pkprosol/DowntownAlliance into bugfix