Database + Layers
Merge branch 'master' of https://github.com/hermanos/audioguide
Merge branch 'master' of https://github.com/hermanos/audioguide
cleanups
ignore tmp
Remove project
Add gitignore
Resolve Merge
fix master
Random Stuff
Update Master
unicorn config
Merge branch 'develop' of h.github.com:hermanos/audioguide into develop
Merge branch 'develop' of https://github.com/hermanos/audioguide
fix typo in unicorn config
Change ruby version
Merge branch 'master' of https://github.com/hermanos/audioguide
Add from cache something
Resolve some bugs
Update from Develop