x
Merge branch 'master' of github.com:lrnzzz/swag-swap

Conflicts:
	public/javascripts/home.js
Merge branch 'master' of github.com:lrnzzz/swag-swap
Implemented transactions