diff --git a/img/loading_spinner.gif b/img/loading_spinner.gif
new file mode 100644
index 0000000..d101a1d
Binary files /dev/null and b/img/loading_spinner.gif differ
diff --git a/views/home.html b/views/home.html
index 36ddd02..87f55ef 100644
--- a/views/home.html
+++ b/views/home.html
@@ -2,7 +2,7 @@
 
 	<div class="row">
 		<div class="loading col-lg-8 col-lg-offset-2" ng-if="!radionice && !ovaRadionica">
-			<img src="http://www.arabianbusiness.com/skins/ab.main/gfx/loading_spinner.gif" />
+			<img src="/img/loading_spinner.gif" />
 		</div>
 	</div>
 
@@ -34,28 +34,6 @@ <h2 class="workshop-title">{{ovaRadionica.ime}}</h2>
 			<a href="#/add" class="btn btn-primary"> Dodaj radionicu </a>
 		</div>
 	</div>
-<<<<<<< HEAD
-</div>
-
-<div class="row">
-	<h1 class="work-title"> DOGAĐAJI </h1>
-	<div class="col-lg-6 workshop col-md-6  workshop" ng-if="events" ng-repeat="event in events">
-	    <div class="workshop-inner">
-			<h3 class="workshop-title"><a href="#/{{event.id}}">{{event.ime}}</a></h3>
-			<img class="col-md-12 workshop-image img-responsive" src="{{event.img}}"/>
-		  <p class="workshop-text text-info">{{event.mesto}}</p>
-||||||| merged common ancestors
-</div>
-
-<div class="row">
-	<h1 class="work-title"> DOGAĐAJI </h1>
-	<div class="col-lg-6 workshop col-md-6  workshop" ng-if="events" ng-repeat="event in events">
-	  <div class="workshop-inner">
-			<h3 class="workshop-title"><a href="#/{{event.id}}">{{event.ime}}</a></h3>
-			<img class="col-md-12 workshop-image img-responsive" src="{{event.img}}"/>
-		  <p class="workshop-text text-info">{{event.mesto}}</p>
-=======
-
 
 	<div class="row">
 		<h1 class="work-title"> DOGAĐAJI </h1>
@@ -65,30 +43,15 @@ <h3 class="workshop-title"><a href="#/{{event.id}}">{{event.ime}}</a></h3>
 				<img class="col-md-12 workshop-image img-responsive" src="{{event.img}}" />
 				<p class="workshop-text text-info">{{event.mesto}}</p>
 			</div>
->>>>>>> origin/master
 		</div>
 	</div>
 
-<<<<<<< HEAD
-<div class="row">
-	<div class="col-lg-8 col-lg-offset-2 workshop" ng-if="thisEvent">
-	  <h2 class="workshop-title">{{thisEvent.ime}}</h2>
-		<img class="col-md-12 workshop-image img-responsive" src="{{thisEvent.img}}"/>
-	  <p class="workshop-text text-info">{{thisEvent.mesto}}</p>
-	</div>
-</div>
-||||||| merged common ancestors
-<div class="col-lg-8 col-lg-offset-2 workshop" ng-if="thisEvent">
-  <h2 class="workshop-title">{{thisEvent.ime}}</h2>
-	<img class="col-md-12 workshop-image img-responsive" src="{{thisEvent.img}}"/>
-  <p class="workshop-text text-info">{{thisEvent.mesto}}</p>
-</div>
-=======
-	<div class="col-lg-8 col-lg-offset-2 workshop" ng-if="thisEvent">
-		<h2 class="workshop-title">{{thisEvent.ime}}</h2>
-		<img class="col-md-12 workshop-image img-responsive" src="{{thisEvent.img}}" />
-		<p class="workshop-text text-info">{{thisEvent.mesto}}</p>
+	<div class="row">
+		<div class="col-lg-8 col-lg-offset-2 workshop" ng-if="thisEvent">
+		  <h2 class="workshop-title">{{thisEvent.ime}}</h2>
+			<img class="col-md-12 workshop-image img-responsive" src="{{thisEvent.img}}"/>
+		  <p class="workshop-text text-info">{{thisEvent.mesto}}</p>
+		</div>
 	</div>
 
 </section>
->>>>>>> origin/master