Merge pull request #23 from hohungyi/master

added video working
done date selection in tabs
fixed the conflict for css
Merge branch 'decatan-master'

manged to save the errors
insert
added videos and included click buttons on main page