Added Message History screen
Modified main activity to include a Message History button
Merged conflicting files