Merge
Merge branch 'master' of https://github.com/maalaang/Sunrise

Conflicts:
	settings/config.php
Room Page -ing
Merge
Modified tail_content
Adding style in foot.css
Modifying tail_content
Modifying tail_content
Modifying tail_content
Icon Css
Icon Css
Icon fonts
Modifying bootstrap.css
Merge branch 'master' of https://github.com/maalaang/Sunrise

Conflicts:
	css/foot.css