Merge branch 'master' of github.com:tbarth17/fest
errors fixed
Merge pull request #13 from olliegill/master

errors popup fixed