implementing functionality in the web page
fixed that badass bug of StackOverflow
Merge remote-tracking branch 'origin/Cristi'