nothing
Merge branch 'master' of https://github.com/dcelik/MobileProtoFall2014-LoCo

Conflicts:
	LoCo/app/app.iml
Merge branch 'master' of https://github.com/dcelik/MobileProtoFall2014-LoCo
fixed untracked files