Merge changes
Merge branch 'master' of heroku.com:enigmatic-headland-9222

Conflicts:
	.idea/workspace.xml
	db/schema.rb
Merge branch 'master' of https://github.com/indrekilves/tw-challenge-2014
New feature: transaction done page
Some ass uploaded .idea file - for merge
Merge branch 'master' of heroku.com:enigmatic-headland-9222

Conflicts:
	.idea/workspace.xml
	config/routes.rb
New feature: transfer link page finished
Merging idea files
Merge branch 'master' of https://github.com/indrekilves/tw-challenge-2014

Conflicts:
	.idea/workspace.xml
Merge branch 'master' of https://github.com/indrekilves/tw-challenge-2014