ignore workspace.xml
ignore xcuserstate
configurable URLs
Merge branch 'master' of https://github.com/akosputz/HappyTraffic

Conflicts:
	web/.idea/workspace.xml
merge
ignore yet another file