Merge pull request #18 from jburnham96/master

changes to content
Merge pull request #23 from jburnham96/master

Merging from master to dev_James
Merge pull request #25 from jburnham96/dev_James

Dev james