Apparently I need an index.html file...who knew?
Merge branch 'master' of http://github.com/ednewton/theoracle

Conflicts:
	index.html