Some changes
Merge branch 'master' of https://github.com/WingsProject/Redbull

Conflicts:
	css/style.css