edited bugs and added feedback page
log
log
merge