asdasd
Merge branch 'master' of https://github.com/nicolaeturcan/pacman

Conflicts:
	index.html