Popravil
Zabil sdelat rspec
add rails_helper.rb && rspec_helper.rb
add params to start travis with postgres
do with out welcome contoller
Merge pull request #2 from wat32/do_travis_work

do with out welcome contoller
Rename database.yml to database.yml.sample
last fix for work; add cache directories
modify .travis.yml
add cache to .travis.yml
add deploy to heroku to .travis.yml
add deploy to heroku to .travis.yml
add deploy to heroku for prod and dev to .travis.yml
travis config

Conflicts:
	.gitignore
	.travis.yml
	config/database.yml.travis
Merge pull request #4 from wat32/do_travis

Do travis
travis config

Conflicts:
	.gitignore
	.travis.yml
	config/database.yml.travis
Merge pull request #1 from wat32/dev

Popravil