Added Navigation buttons
Merge branch 'master' of https://github.com/TeamFujin/Pets

Conflicts:
	Pets/Pets/Base.lproj/Main.storyboard
Revert 991047b..86276f9

This rolls back to commit 991047b9adfd9e87c862bd5cb8a1495765d2fbb9.
More refactoring