add main view and user view
Merge branch 'master' of https://github.com/turner11/Android-Final-Project

Conflicts:
	SmsTranslator/AndroidManifest.xml
	SmsTranslator/res/values/strings.xml
	SmsTranslator/src/com/finalProject/smstranslator/MainActivity.java
sync