Merge branch 'dev'
authormatthew <matthew@owens.tech>
Sun, 5 Aug 2018 15:30:15 +0000 (16:30 +0100)
committermatthew <matthew@owens.tech>
Sun, 5 Aug 2018 15:30:15 +0000 (16:30 +0100)
commit3475d95ac67d5d8ba2f270d0eb7710c26b70d897
treefceaec9465dec22066a190c852535b35b017efd5
parentf81027cf4b031a1aee22abdf3f585b0712264976
parentc39092529f84756fd70f63951aa964db36204d07
Merge branch 'dev'

implemented error messages