hello
Merge branch 'master' of https://github.com/AriellaLev/whatShouldIDo

Conflicts:
	static/question.html
commit
Merge branch 'master' of https://github.com/AriellaLev/whatShouldIDo

Conflicts:
	static/question.html