added angular and bootstrap and merged with kirbs
added angular and bootstrap and merged with kirbs