adding layout files
adding bootstrap files and jquery files
updating index and controller
Merge branch 'development' into Dan
Merge branch 'master' into Dan
Merge branch 'testing' into Dan
updating basic functionality
update
Merge branch 'Dan' into development