Shannon's stuff
Resolved differences
Merge branch 'master' of https://github.com/youssif/bathroom_stall
not too sure
Added comments model and controller