updated a lot
added bootstrap and haml to project