views/app/_layout_main.php
Merge branch 'master' of https://github.com/firmantok/dev1

Conflicts:
	application/views/app/_layout_main.php
Merge branch 'master' of https://github.com/firmantok/dev1

Conflicts:
	application/controllers/app/analisa_harga.php
	application/views/app/_layout_main.php
Merge branch 'master' of https://github.com/firmantok/dev1
update bootstrap.min.css