resolve changes in index
resolved changesMerge branch 'master' of https://github.com/baabte/baabtra

Conflicts:
	index.html