Updating Readme in master
Merge branch 'master' of github.com:gorje001/auto_mobile_test
Updating readme
Merge branch 'development' of github.com:gorje001/auto_mobile_test into development
Updating readme
Merge pull request #17 from origin/development#test_deve
Updating Changelog
Updating
Merge remote-tracking branch 'origin/master' into development

Conflicts:
	README.txt
Merge remote-tracking branch 'origin/development' into development#test_dev

Conflicts:
	Gemfile.lock
	README.txt
Updating gemlock