shit to fix
to pull
Merge fixed
Done
to push
Merge branch 'master' of https://github.com/pkprosol/DowntownAlliance