initial commit
Merge branch 'master' of github.com:mhcornejo/tijuananet

Conflicts:
	Default.cshtml
	css/site.css