Merge remote-tracking branch 'origin/master' into poonam-edits
#115 fix
test footer float
Merge remote-tracking branch 'origin/poonam-edits'