~~
solve conflict

Conflicts:
	index_mobile.html