initial`
mgerge branch 'master' of github.com:DeFranDeveloping/defrandeveloping.com

Conflicts:
	.gitignore
	static/index.html