update
solving conflicts
adding navigation, responsive and animation features
Merge pull request #2 from juliogc/develop

Develop - adding navigation, responsive and animation features