Merge branch 'development' of github.com:somecar/somecar into development
first changes with bootstrap
Merge branch 'development' of github.com:somecar/somecar into development

Conflicts:
	Gemfile
change rails version
before pushing
tests with welcome/proba
after comments on github by lvlonax
Merge pull request #7 from Neodelf/15-cancan

15-cancan
add base
Merge pull request #8 from Neodelf/development

prod.rb
next..
done!
without upload files
without uploader files with some changes
without uploader files with corrected comments
folder idea is deleted
working ads, but all views dont translation
Merge pull request #9 from Neodelf/8-ad

8 ad
little changes
Merge branch 'development' of github.com:somecar/somecar into development

Conflicts:
	Gemfile
	Gemfile.lock
	app/views/layouts/application.html.erb