Initial commit
Merge branch 'master' of github.com:maxmeyer/fedux_org-rails

Conflicts:
	LICENSE
	README.md
Fixed readme
Merge branch 'master' into working