Merge branch 'master' into 4apr_plan_c
migration
Merge branch 'master' of https://github.com/epoch/codium
remove conflict text
Merge branch 'master' into dev_ed
fixed bottom section styles
Edited Heroku configuration
Merge pull request #71 from elitenomad/master

Edited Heroku configuration
Merge pull request #72 from ed-fast/dev_ed

Dev ed
Merge branch 'master' of https://github.com/epoch/codium
Merge pull request #73 from albertodotcom/master

Merges
Added Async to load javascript in the background whilst page loads
change links
Merge pull request #74 from albertodotcom/master

change links
Added Caching and Load Stylesheets before JS

Added Caching to Stylesheets and Javascript to improve performance.
Moved Stylesheets to load before Javascript.
Merge branch '4apr_plan_c' of https://github.com/ltfschoen/codium into ltfschoen-4apr_plan_c
Shifted inline CSS into head to optimise page load time
Merge pull request #76 from albertodotcom/master

Merge changes
Allows Cache Control version to be saved by proxies and intermediate servers
Added Max-Age to 1 week before cache expires