Second commit
Incomplete version
More fixes and content
Implementing contact functionality
Merge pull request #1 from jjgumucio/develop

Develop