init
Merge branch 'dev'

Conflicts:
	public_html/css/main.css