Created a setting activity.
Added launcher icons. YAY!
Merging updates