gtroll
Merge branch 'master' of https://github.com/remysanfeliu/Travelr

Conflicts:
	res/layout/activity_main.xml