Following Push
Merge branch 'master' of https://github.com/NathanBWaters/OutfitrMobile

Conflicts:
	Outfitr/.classpath