Updated error message
Updated error message
Merge branch 'master' into jake-dev-unstable
Updated good stuff
Updated alert thingy
Fixed merge conflict with edit alert message.
Local dev stuff
Update .gitignore
Fixed merge