added foundation
working on welcome page
resolved merge conflict
other changes