commit
conflict
not necesary

Merge branch 'master' of https://github.com/auditoriumCS/auditorium