commit so i can merge
Merge branch 'master' of https://github.com/kenliao94/personal_website

Conflicts:
	index.html
Added the content of ThoughtSpot App