Merge pull request #78 from mattjbarlow/staging

Staging
Merge pull request #80 from mattjbarlow/staging

Staging
added my name
Merge pull request #81 from mattjbarlow/aj_dev

Aj dev