oh-ma-gerdzzzzz finally working
getting closer
Merge branch 'drkyro' of github.com:lincolnhack/lincolnhack
fixed master
got the youtube api working
added videos and video sync function
Merge branch 'alain' into drkyro

Conflicts:
	config/database.yml