init commit
some changes to nav, images positioning and footer
resolved conflicts from heroku