Dylan's commit on new self branch.
Merge pull request #1 from adam6806/Adam

Test my own branch.
Merge branch 'Dylan'

Conflicts:
	res/values/strings.xml
Some work done:
Added new fragment, new buttons for action bar, new strings, and messed
with MainActivity;

Left you fancy commits, text me if you need anything. I am going to be
at comic con all weekend, so not much time to work. I will do what I can
though
Merge pull request #3 from adam6806/Dylan

Some work done: