user.rb conflict
merge new master
Merge branch 'master' of https://github.com/hassaniftikhar/propheticcoaching
Merge branch 'master' of https://github.com/hassaniftikhar/propheticcoaching
BF update question
Merge branch 'master' of https://github.com/hassaniftikhar/propheticcoaching
BF Email
question with validation
replace with unless and order by coach name
intermediate ebook content duplicate validation
intermediate ebook content duplicate validation2
reset password email