i have no idea what is going on.
I think we did the same work twice.
Merge branch 'master' of github.com:ornj/lord-simeons

Conflicts:
	_data/burritos/beefeater.json
	_data/burritos/captain_james_cook.json
	_data/burritos/earl_of_sandwich.json
	_data/burritos/edinburgh.json
	_data/burritos/princess_di.json
	_data/burritos/troubles.json
	index.html
Lookin faaaancy