Changed hashtag argument
Solved conflict in index

Conflicts:
	index.php