Added alert feature to the app.
Merge branch 'newfeature'