Merge pull request #17 from johanasplund/master

Fixed a problem where get_new_video tries to make float(inf) into an int...
l
l
l
l
l
Merge pull request #18 from johanasplund/master

Fixed the category search
Merge https://github.com/metalgeek/forgotitube
Gangsta rap made me do it
l
quick fix for & problem
replaced &amp; with & in vid.category so that it is outputed correctly in the web application