Put in an enter..lol.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/example/Banter/BanterMenuFragment.java
Trying to get the newest shiiit.