- Initalise
Merge branch 'master' of github.com:trieukhang274/theNewOF

Conflicts:
	index.html
	reset.css
	style.css
	style.scss