Merge development and master branches

-Layout redesign
-Add fixed header
-Create new-portfolio page and functional form
-Lots of smaller details