background
delete gem lock
 fix conflict
fix conflixt
fix conflicts
Merge branch 'develop' of github.com:hermanos/audioguide into design
Merge branch 'develop' of https://github.com/hermanos/audioguide into design
modify gemfile
Merge branch 'design' of https://github.com/hermanos/audioguide into design
change seed
fix seeds
seeds fix
gemfile fix
change style for admin simple
another design
another design
dashboard admin
fix conflicts
Merge branch 'develop' of https://github.com/hermanos/audioguide into design
fix comflicts