minor fixes
Merge branch 'james'
updated about page
Merge branch 'james'
adding terms and conditions