foot.css
jumbo.css
Modified main
Merge branch 'master' of https://github.com/maalaang/Sunrise

Conflicts:
	css/jumbotron.css
	views/main/signin.php