diff --git a/functions.php b/functions.php
index 96cb5fc..910c854 100644
--- a/functions.php
+++ b/functions.php
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 <?php
 /**
  * cornerstone functions and definitions
@@ -188,4 +187,46 @@ function load_custom_wp_admin_style($hook) {
 }
 add_action( 'admin_enqueue_scripts', 'load_custom_wp_admin_style' );
 
-add_theme_support( 'post-thumbnails' ); 
\ No newline at end of file
+add_theme_support( 'post-thumbnails' ); 
+
+//Bootstrap whitelist
+function add_allowed_tags($tags) {
+	$newtags = array(
+			'div',
+			'ul',
+			'li',
+			'button',
+			'a');
+	$newattrs = array(
+			'data-toggle' => true,
+			'data-dismiss' => true,
+			'data-target' => true,
+			'data-spy' => true,
+			'data-loading-text' => true,
+			'data-parent' => true,
+			'data-slide' => true,
+			'data-slide-to' => true,
+			'data-provide' => true,
+			'data-interval' => true,
+			'data-pause' => true,
+			'data-animation' => true,
+			'data-html' => true,
+			'data-placement' => true,
+			'data-selector' => true,
+			'data-title' => true,
+			'data-trigger' => true,
+			'data-delay' => true,
+			'data-container' => true);
+
+	foreach($newtags as $newtag){
+		if( isset($tags[$newtag]) && is_array($tags[$newtag])){
+			$tags[$newtag] = array_merge($tags[$newtag], $newattrs);
+		}
+		else{
+			$tags[$newtag] = $newattrs;
+		}
+	}
+	
+    return $tags;
+}
+add_filter('wp_kses_allowed_html', 'add_allowed_tags');
\ No newline at end of file