31 july
remove conflicts
work on upload logo
remove conflicts
work on upload logo 1 aug
add athontication to home controller
add athontication to home controller
Merge pull request #261 from vaibhavcisin274/poonam

Poonam