Merge branch 'hotfix/1.1a' into develop
Merge branch 'hotfix/1.1b' into develop
Merge branch 'hotfix/1.1c' into develop
Initial Commit of Contact.
Tried to make a php mailer. Having issues with server.
lang en added to html
Merge branch 'feature/contact_page' into develop

Conflicts:
	index.html
	work/active-reader/index.html
	work/hipmunk-tours/index.html
	work/index.html
Remove contact page until ready to work on it again.
Failed to update work page correctly after merge.
Initial commit of F-P and D-P in work page. Fisher-Price Page fleshed out fully.
Fixed issue with height auto on images for work page.
Initial commit of Disney-Pixar page. TODO: My role sections need to be filled out.
Updated the Disney-Pixar page with my role information.
Merge branch 'feature/work_page' into develop
Update to copy on both the Fisher-Price and the Disney-Pixar pages.
Updated copy on Disney-Page to include my work as build engineer.
Merge branch 'release/1.2'