seed data
Merge pull request #15 from adamdruppe/user_login

seed data
Merge branch 'master' into staging

Fixed merge conflict by sticking with staging version of routes.  We'll
update master soon to match.

Conflicts:
	config/routes.rb
Merge branch 'staging' of https://github.com/beyond-z/beyondz-platform
Updated gitignore to ignore needed files from other branch.