diff --git a/app/templates/orbit_bootstrap/modules/faq/_widget.html.erb b/app/templates/orbit_bootstrap/modules/faq/_widget.html.erb
new file mode 100644
index 0000000..d086bc1
--- /dev/null
+++ b/app/templates/orbit_bootstrap/modules/faq/_widget.html.erb
@@ -0,0 +1,17 @@
+<div class="widget-1 row" module="announcement" data-repeat="3" data-module="announcement" data-ps="">
+  <div class="box col-sm-4">
+    <!-- .box-inner -->
+    <div class="box-inner">
+      <div class="pic">
+        <img src="http://placehold.it/360x200" alt="">
+      </div>
+      <div class="box-excerpt">
+        <h3 class="box-title">{{title}}</h3>
+        <span>{{postdate}}</span>
+        <p>{{subtitle}}</p>
+        <p><a href="{{link_to_show}}">Some Link</a></p>
+      </div>
+    </div><!-- /.box-inner -->
+  </div><!-- /.box -->
+</div>
+<hr class="dotted">
\ No newline at end of file
diff --git a/app/templates/orbit_bootstrap/modules/faq/_widget1.html.erb b/app/templates/orbit_bootstrap/modules/faq/_widget1.html.erb
new file mode 100644
index 0000000..160def8
--- /dev/null
+++ b/app/templates/orbit_bootstrap/modules/faq/_widget1.html.erb
@@ -0,0 +1,12 @@
+<div class="widget-2" module="announcement" data-ps="">
+  <h2 class="widget-title">{{widget-title}}</h2>
+  <ul class="widget-list" data-repeat="6" data-module="announcement">
+    <li>
+      <a href="{{link_to_show}}"><i class="fa fa-chevron-right"></i>{{title}}<span>{{postdate}}</span></a>
+    </li>
+  </ul>
+  <p class="more">
+    <a class="btn btn-sm btn-info" href="/module/announcement">More</a>
+  </p>
+</div>
+<hr class="dotted">
\ No newline at end of file
diff --git a/app/templates/orbit_bootstrap/modules/faq/index.html.erb b/app/templates/orbit_bootstrap/modules/faq/index.html.erb
new file mode 100644
index 0000000..47862f5
--- /dev/null
+++ b/app/templates/orbit_bootstrap/modules/faq/index.html.erb
@@ -0,0 +1,8 @@
+<h2 class="widget-title">{{widget-title}}</h2>
+<ul class="media-list index" module="faq" data-repeat="4" data-module="faq">
+  <li class="media">
+    <div class="media-body">
+      <h4 class="media-heading"><a href="{{link_to_show}}">{{question}}</a></h4>
+    </div>
+  </li>
+</ul>
\ No newline at end of file
diff --git a/app/templates/orbit_bootstrap/modules/faq/show.html.erb b/app/templates/orbit_bootstrap/modules/faq/show.html.erb
new file mode 100644
index 0000000..c4677d8
--- /dev/null
+++ b/app/templates/orbit_bootstrap/modules/faq/show.html.erb
@@ -0,0 +1,14 @@
+<article class="show" module="announcement">
+  <div class="post-title">
+    <h1>{{question}}</h1>
+  </div>
+  <section class="post">
+    <p>{{answer}}</p>
+  </section>
+  <div class="post-related" data-repeat-content="faqs_files">
+   <a href="{{file_url}}" target="_blank">{{file_title}}</a><br/>
+  </div>
+  <div class="post-related" data-repeat-content="faqs_links">
+   <a href="{{link_url}}" target="_blank">{{link_title}}</a><br/>
+  </div>
+</article>
\ No newline at end of file
diff --git a/built_in_extensions.rb b/built_in_extensions.rb
index e7a9d6b..6127178 100644
--- a/built_in_extensions.rb
+++ b/built_in_extensions.rb
@@ -3,3 +3,4 @@ gem 'ad_banner', git: 'git@gitlab.tp.rulingcom.com:saurabh/adbanner-test.git'
 gem 'gallery', git: 'git@gitlab.tp.rulingcom.com:saurabh/gallery.git'
 gem 'links', git: 'git@gitlab.tp.rulingcom.com:saurabh/links.git'
 gem 'page_content', git: 'git@gitlab.tp.rulingcom.com:saurabh/pagecontent.git'
+gem 'faq', git: 'git@gitlab.tp.rulingcom.com:saurabh/faq.git'