commiting reset changes
bootstrap back to basic layout
Merge branch 'tester2'