final1
Merge branch 'master' of https://github.com/Antil1993/Oasisi2K14Intro

Conflicts:
	css/styles.css