Merge branch 'adam_dev' of github.com:zalary/zadamstragram into adam_dev

Conflicts:
	db/seeds.rb
db seeds orig
Merge branch 'adam_dev' of github.com:zalary/zadamstragram into adam_dev
Merge branch 'adam_dev' of github.com:zalary/zadamstragram into adam_dev