Created a namespace for footbagmoves in top level urls.py
Created a base template for the site and implemented the homepage by extending that
Resolved merge conflicts
fixed merge issue
Updated the footbag component pages to inherit from base template