Initial commit
Tabbed UI working
Tabbed UI working project
added rooms icon
commiting app.iml to pull repository
Colors of tab bar changed. Started using git on Android Studio. Trying to resolve conflicts with Ben's last merge.
Colors of tab bar changed. Started using git on Android Studio. Trying to resolve conflicts with Ben's last merge.
Trying to fix issue after Ben's merge

Merge branch 'master' of https://github.com/Z-Home/capstone