Some work
Merge branch 'master' of https://github.com/Frizzy112/TelevaagSearch

Conflicts:
	.DS_Store
bla