Merge pull request #24 from rhayes-cida/master

EDEN template and styling applied.
Merge remote-tracking branch 'upstream/master'