* merged css and js files and layout from dev branch * merged here Robert's PR * new conf.py file * added a comment * added a comment2 * asd1 * asd2 * asd3 * asd4 * asd5 * asd6 * asd7 * sad