started camera funciton with AVCAM
Merge branch 'master' of github.com:joshandrews/1photo

Conflicts:
	1photo/Main.storyboard