first commmit
added movie stuff
fixing bootstrap issue
before checkout
after checkout
removed conflicts