Continued working on Twitter login
Merge branch 'master' of github.com:txsl/hipflask into design
Video Page Finished
Twitter oauth now working
Merge branch 'master' of github.com:txsl/hipflask
youtube scraper
Merge branch 'master' of https://github.com/txsl/hipflask
working on youtube and models
Started profile, fixed search in template and header
Merge branch 'master' of github.com:txsl/hipflask into design

Conflicts:
	__init__.py
	templates/search.html
	templates/skeleton.html