Second commit
Incomplete version
More fixes and content
Implementing contact functionality
Fixing branches
Fixing branches2
Merge pull request #2 from jjgumucio/develop

Develop