app 2
Merge branch 'master' of https://github.com/campeloal/bepid

Conflicts:
	App_2/LibViewController.h
	App_2/LibViewController.m