Adding in layout for homepage
got some of angular working...
adding stuff for front page
 Fixing merge conflicts