add factory girl
add pry
update rspec
add article model
create user as super user
add location
add tibidabo
Merge pull request #2 from leifg/bootstrap_model

Add article and location
Merge branch 'master' into admin_screens

Conflicts:
	db/schema.rb