Corrected git complaint about colors.xml and styles.xml
Merge branch 'MainFragment' of https://github.com/CMPUT301F14T08/StackUnderflow into MainFragment

Conflicts:
	StackUnderflow/res/values/colors.xml
	StackUnderflow/res/values/styles.xml