Initial commit on cs.utexas.edu domain
Merge https://github.com/UTexasMAD/utexasmad.github.io

Conflicts:
	README.md
	events/index.html
	events/umad/index.html
	events/umad/schedule/index.html
	img/about-lg.jpg
	img/austin-lg.jpg
	img/austin-sm.jpg
	img/comyar.jpg
	img/daniel.jpg
	img/eddie.jpg
	img/lab-lg.jpg
	img/niko.jpg
	img/sai.jpg
	img/sebastian.jpg
	img/under-construct.jpg
	img/who-lg.jpg
	index.html
	resources/index.html
	styles.css