After git ignore fixed by Max.
resolve merge confilct Symeetry/HomeViewController.m
correct more merge conflict
resolve merge conflict Symeetry.xcodeproj/project.pbxproj
resolve merge conflict Symeetry/HomeViewController.m
Merge branch 'beacon'
correct file Symeetry/Symeetry.xcodeproj
edited profile
correct current user crash
Merge branch 'master' of https://github.com/stoosevich/Symeetry
profile picture show
change the Parse photo column
cleaned up profile
Merge branch 'master' of https://github.com/stoosevich/Symeetry
add additional methods to parse maager, update home view controller
Merge branch 'master' into beacon