working on mockup
working on bug for 304 error
Merge branch 'master' of https://github.com/ccaballero/pleni

merge
working on fixes for fetching