Bundle Install CanCan + Basic Authorization
CanCan first commit
Baburiba
Habar nu am ce se intampla aici...
Merge with develop
Add coordonations for museums
Change
CanCan Achievements
Merge branch 'develop' of github.com:hermanos/audioguide into pixies
Delete shared from Achievements
Museum Show and Index
Add images to museums and exhibits
Add carrierwave gem
solved other conflicts
Create uploader and change type of fields image
resolve conflicts
Extra changes for conflict
Extra changes for vs 2
a conflict
Add uploading image