Set up layout for settings
Commiting modified files
Merge branch 'master' of https://github.com/connienguyen/remembertext
Test incomingMessage class