From 123356681d6838f19e8483e3080470ddf67869cf Mon Sep 17 00:00:00 2001
From: Angel Kittiyachavalit <angel.kittiyachavalit@gmail.com>
Date: Tue, 7 Aug 2012 19:18:16 -0700
Subject: [PATCH] Resolved more merge conflicts

---
 index.html | 161 ++++++++++++++---------------------------------------
 1 file changed, 43 insertions(+), 118 deletions(-)

diff --git a/index.html b/index.html
index 595e914..107d0d3 100644
--- a/index.html
+++ b/index.html
@@ -205,6 +205,7 @@ <h6><span class="numbers">2.</span> If you don't have an account, get setup.</h6
 								<li><span class="arrows">></span> An “ @ ” will be added to the front of the name and always be included as part of the name (<a href="https://twitter.com/CityofSunnyvale">@HonoluluGov</a>).</li>
 								<li><span class="arrows">></span> It will then prompt you to build your profile by following others, making your profile searchable by category, and adding character (image and bio) to your profile. You have the option to skip this if needed; you can always do this later.</li>
 								<li><span class="arrows">></span>Confirm the email address and you're done!</li>	
+              </ul>
 						<h6><span class="numbers">3.</span> Edit your profile</h6>
               <ul>
                 <li><span class="arrows">></span>If you already have a twitter account, ensure your name, or handle is easy to recognize, and sounds official. At any point, you can change your handle to a more readable, credible, and easily identifiable name while maintaining all your current followers and posts. Instead of @HNL_info, use @CityofHNL or @HonoluluGov</li>
@@ -233,7 +234,6 @@ <h6>Sample tweet</h6>
 							<ul>
 								<li>“The <a href="https://twitter.com/honolulufest">@honolulufest</a> begins today. Join us downtown from 10-5 for <a href="https://twitter.com/#!/search/%23music">#music</a> <a href="https://twitter.com/#!/search/%23food">#food</a> and festivities! <a href="http://bit.ly/OKCyzk">http://bit.ly/OKCyzk</a>
 							</ul>
-<<<<<<< HEAD
         </div>
 
         <div class="program_cont row" id="tactic-twt"> 		
@@ -273,7 +273,9 @@ <h6>Tactics</h6>
 		<div class="main_cont" id="flickr">
 			<h1><img src="img/flickr.png"> Flickr</h1>
 				<div class="top_art_cont">
-					<p>There is 1 main Flickr page for the City of Honolulu's photos: <a href="http://www.flickr.com/photos/honolulugov">flickr.com/photos/honolulugov</a></p>
+					<p>Flickr is a great way to host a comprehensive public database of a city’s photographs. Photos can be viewed by anyone without the need to register an account, so residents can quickly see that recent community event or city function. You can easily share photos from Flickr to other social media platfroms.</p>
+          <p>The City of Honolulu has one Flickr page: Flickr page: <a href="http://www.flickr.com/photos/honolulugov">http://flickr.com/honolulugov</a></p>
+          <p>Here are an examples of city that use Flickr well: <a href="http://www.flickr.com/photos/weho">City of West Hollywood</a>
           <div class="secondnav">
             <ul>
               <li>Explore Flickr: <a href="#get-started-flickr">Getting Started</a> | <a href="#fundamental-flickr"> The Fundamentals </a>|<a href="#tactic-flickr"> Some Tactics</a></li>
@@ -281,133 +283,56 @@ <h1><img src="img/flickr.png"> Flickr</h1>
           </div>
 				</div>
 				<div class="program_cont row" id="get-started-flickr">
-					<h3 class="ribbon">Getting Started</h3>
-  					<h6><span class="numbers">1.</span> Go to <a href="http://www.flickr.com">flickr.com</a></h6>
+          <h3 class="ribbon">Getting Started</h3>
+            <h6><span class="numbers">1.</span> Go to <a href="http://www.flickr.com">flickr.com</a></h6>
+              <ul>
+                <li><span class="arrows">></span> If you have a Yahoo!, Google, or Facebook account, click “Sign in” at the top.</li>
+                <li><span class="arrows">></span> Otherwise, click “Sign up” to create a new account.</li>
+                <li><span class="arrows">></span> Follow the prompts. Fill in required information.</li>
+                <li><span class="arrows">></span> A verification email will be sent your primary email address. Click the link in the email to confirm your account.</li>
+              </ul>
+            <h6><span class="numbers">2.</span> Create a screen name</h6>
               <ul>
-  							<li><span class="arrows">></span> If you have a Yahoo!, Google, or Facebook account, click “Sign in” at the top.</li>
-  							<li><span class="arrows">></span> Otherwise, click “Sign up” to create a new account.</li>
-  							<li><span class="arrows">></span> Follow the prompts. Fill in required information.</li>
-  							<li><span class="arrows">></span> A verification email will be sent your primary email address. Click the link in the email to confirm your account.</li>
+                <li><span class="arrows">></span> Should be easily identifiable</li>
+                <li><span class="arrows">></span> Use city name in it.</li>
+              </ul>
+            <h6><span class="numbers">3.</span> Personalize your profile</h6>
+              <ul>
+                <li><span class="arrows">></span> Create/Upload an icon - the small image that will always be displayed next to your name (logo or crest of the city).</li>
+                <li><span class="arrows">></span> Customize your URL - turn flickr.com/kfjhasimfhweuare into <a href="http://flickr.com/CityOfSunnyvale">flickr.com/CityOfSunnyvale</a> (this is PERMANENT and cannot be undone).</li>
+                <li><span class="arrows">></span> Personalize your profile - add basic info about the city and city’s website.</li>
               </ul>
-  						<h6><span class="numbers">2.</span> Create a screen name</h6>
-  							<ul>
-  								<li><span class="arrows">></span> Should be easily identifiable</li>
-  								<li><span class="arrows">></span> Use city name in it.</li>
-  						  </ul>
-  						<h6><span class="numbers">3.</span> Personalize your profile</h6>
-  							<ul>
-  								<li><span class="arrows">></span> Create/Upload an icon - the small image that will always be displayed next to your name (logo or crest of the city).</li>
-  								<li><span class="arrows">></span> Customize your URL - turn flickr.com/kfjhasimfhweuare into <a href="http://flickr.com/CityOfSunnyvale">flickr.com/CityOfSunnyvale</a> (this is PERMANENT and cannot be undone).</li>
-  								<li><span class="arrows">></span> Personalize your profile - add basic info about the city and city’s website.</li>
-  					    </ul>
         </div>
 
         <div class="program_cont row" id="fundamental-flickr"> 			
 					<h3 class="ribbon">The Fundamentals</h3>  
-						<ul>
-							<li>Upload photos! You can do this one at a time or in batches.
-								<ul>
-									<li>To upload all photos in a folder, hold down command [Mac] or control [Windows] and press A. Then click “Upload.”</li>
-									<li>To upload selected photos, hold down command [Mac] or control [Windows] and click on the specific photos desired. Then click “Upload.”</li></ul>
-						      <li>Tag and Organize</li>
-=======
-						<h6>Build you community</h6>
-							<ul>
-								<li><span class="arrows">></span>Follow others. It's an easy way to get more people to follow you and grow your impression.</li>
-								<li><span class="arrows">></span>Retweet often. You want people to retweet you, so retweet them. It's a good way to build social capital.
-								<li><span class="arrows">></span>Tweet a variety of topics and media. Tweet iformation and notifications, as well as news articles, and less formal comments.
-								<li><span class="arrows">></span>Share video from your YouTube channel or pictures from Flickr.</li>
-							</ul>
-						<h6>Broaden your reach</h6>
-							<ul>
-								<li><span class="arrows">></span>Don’t start tweets with “ @ ” unless you're tweeting <i>at someone</i>. Theese are considered a <i>reply</i> and are not displayed to as broad of audience, and look like an internal conversation which will get ignored.</li>
-								<li><span class="arrows">></span>Use hashtags as often as possible. This allows for broader awareness of your message.</li>
-								<li><span class="arrows">></span>Create hashtags for a given topic or event such as the Honolulu Pride Parade (#hnlpride). Promote and get your community to use it as well.
-								<li><span class="arrows">></span>Garner responses by promoting a hashtag.
-								<li><i>Example:</i> “What do you think of the new play structure at <a href="https://twitter.com/#!/search/%23Kilaueapark">#KilaueaPark</a>? Include <a href="https://twitter.com/#!/search/%23kilaueapark">#KilaueaPark</a> in reply.”</li>
-							</ul>
-						<h6>Tactics</h6>			
->>>>>>> updated flickr section!
-							<ul>
-								<li>Click on “Set” (a set is a group of photos that go together (ex: Town Hall, June 2012)
-								<ul>
-									<li>Select appropriate photos for one set, then click and drag into the workspace</li>
-									<li>Add tags: words to identify the picture (ex: Town Hall, June, City of Sunnyvale, Mayor Melinda Hamilton)</li></ul></li>
-  							  <li>You can add sets to “Galleries.” Galleries allow you to bundle sets (ex: Town Halls)	</li>
+             <ul>
+              <li>Upload photos! You can do this one at a time or in batches.
+                <ul>
+                  <li>To upload all photos in a folder, hold down command [Mac] or control [Windows] and press A. Then click “Upload.”</li>
+                  <li>To upload selected photos, hold down command [Mac] or control [Windows] and click on the specific photos desired. Then click “Upload.”</li>
                 </ul>
-                  <li>Under the “You” tab, scroll down to "Your Account" and set your licensing. Through <a href="http://creativecommons.org">Creative Commons</a> you can permit others to use your photos to varying degrees.</li>
-              </ul>
+              <li>Tag and Organize</li>
+                <ul>
+                  <li>Click on “Set” (a set is a group of photos that go together (ex: Town Hall, June 2012)</li>
+                  <ul>
+                    <li>Select appropriate photos for one set, then click and drag into the workspace</li>
+                    <li>Add tags: words to identify the picture (ex: Town Hall, June, City of Sunnyvale, Mayor Melinda Hamilton)</li>
+                  </ul>
+              <li>You can add sets to “Galleries.” Galleries allow you to bundle sets (ex: Town Halls)  </li></ul></li><li>Under the “You” tab, scroll down to "Your Account" and set your licensing. Through <a href="http://creativecommons.org">Creative Commons</a> you can permit others to use your photos to varying degrees.</li>
+            </ul>
         </div>
 
-<<<<<<< HEAD
         <div class="program_cont row" id="tactic-flickr">      
-					<h3 class="ribbon">Some Tactics</h3>  
-						<ul>
-							<li>Share your photos across Facebook and Twitter.</li> 
-								<ul>
-									<li>Use Flickr as your centralized hub so all your city’s photos can be easily viewable in a single location.</li>
-									<li>Each photo uploaded to Flickr will have a unique URL. You can link directly to a specific photo, a set, or a gallery of photos.</li>
-									<li>Each photo uploaded will also have a unique HTML embed code. Use this embed code for websites and email blasts if you would like to display that photo.</li>
-                </ul>
-=======
-							<!--Flickr-->
-							<div class="main_cont" id="flickr">
-								<h1><img src="img/flickr.png"> Flickr</h1>
-								<div class="top_art_cont">
-									<p>Flickr is a great way to host a comprehensive public database of a city’s photographs. Photos can be viewed by anyone without the need to register an account, so residents can quickly see that recent community event or city function. You can easily share photos from Flickr to other social media platfroms.</p>
-
-									<p>The City of Honolulu has one Flickr page: Flickr page: <a href="http://www.flickr.com/photos/honolulugov">http://flickr.com/honolulugov</a></p>
-
-									<p>Here are an examples of city that use Flickr well:<a href="http://www.flickr.com/photos/weho">City of West Hollywood</a>
-								</div>
-								<div class="program_cont row">
-									<h3 class="ribbon">Getting Started</h3>
-										<h6><span class="numbers">1.</span> Go to <a href="http://www.flickr.com">flickr.com</a></h6>
-                      <ul>
-    										<li><span class="arrows">></span> If you have a Yahoo!, Google, or Facebook account, click “Sign in” at the top.</li>
-    										<li><span class="arrows">></span> Otherwise, click “Sign up” to create a new account.</li>
-    										<li><span class="arrows">></span> Follow the prompts. Fill in required information.</li>
-    										<li><span class="arrows">></span> A verification email will be sent your primary email address. Click the link in the email to confirm your account.</li>
-                      </ul>
-										<h6><span class="numbers">2.</span> Create a screen name</h6>
-											<ul>
-												<li><span class="arrows">></span> Should be easily identifiable</li>
-												<li><span class="arrows">></span> Use city name in it.</li>
-										  </ul>
-										<h6><span class="numbers">3.</span> Personalize your profile</h6>
-											<ul>
-												<li><span class="arrows">></span> Create/Upload an icon - the small image that will always be displayed next to your name (logo or crest of the city).</li>
-												<li><span class="arrows">></span> Customize your URL - turn flickr.com/kfjhasimfhweuare into <a href="http://flickr.com/CityOfSunnyvale">flickr.com/CityOfSunnyvale</a> (this is PERMANENT and cannot be undone).</li>
-												<li><span class="arrows">></span> Personalize your profile - add basic info about the city and city’s website.</li>
-									    </ul>
-									
-									<h3 class="ribbon">The Fundamentals</h3>  
-									<ul>
-										<li>Upload photos! You can do this one at a time or in batches.
-											<ul>
-												<li>To upload all photos in a folder, hold down command [Mac] or control [Windows] and press A. Then click “Upload.”</li>
-												<li>To upload selected photos, hold down command [Mac] or control [Windows] and click on the specific photos desired. Then click “Upload.”</li></ul></li>
-									<li>Tag and Organize
-										<ul>
-											<li>Click on “Set” (a set is a group of photos that go together (ex: Town Hall, June 2012)
-											<ul>
-												<li>Select appropriate photos for one set, then click and drag into the workspace</li>
-												<li>Add tags: words to identify the picture (ex: Town Hall, June, City of Sunnyvale, Mayor Melinda Hamilton)</li></ul></li>
-										<li>You can add sets to “Galleries.” Galleries allow you to bundle sets (ex: Town Halls)	</li></ul></li><li>Under the “You” tab, scroll down to "Your Account" and set your licensing. Through <a href="http://creativecommons.org">Creative Commons</a> you can permit others to use your photos to varying degrees.</li></ul>
-									
-									<h3 class="ribbon">Some Tactics</h3>  
-									<ul>
-										<li>Share your photos across Facebook and Twitter. 
-											<ul>
-												<li>Use Flickr as your centralized hub so all your city’s photos can be easily viewable in a single location.</li>
-												<li>Each photo uploaded to Flickr will have a unique URL. You can link directly to a specific photo, a set, or a gallery of photos.</li>
-												<li>Each photo uploaded will also have a unique HTML embed code. Use this embed code for websites and email blasts if you would like to display that photo.</li></ul></li>
->>>>>>> updated flickr section!
-									<li>Photos are the best way to easily and quickly highlight events or provide updates.</li>
-									<li>Use photos to show happenings around the city and allow the community to stay informed and be involved.</li>
-									<li>Joining groups related to your community is a great way to develop a following.</li>
+          <h3 class="ribbon">Some Tactics</h3>  
+            <ul>
+              <li>Share your photos across Facebook and Twitter.</li>
+                <ul>
+                  <li>Use Flickr as your centralized hub so all your city’s photos can be easily viewable in a single location.</li>
+                  <li>Each photo uploaded to Flickr will have a unique URL. You can link directly to a specific photo, a set, or a gallery of photos.</li>
+                  <li>Each photo uploaded will also have a unique HTML embed code. Use this embed code for websites and email blasts if you would like to display that photo.</li>
                 </ul>
-              </ul>		
+            </ul>	
 				</div>
 				<div id="finish_line_cont"></div>
 		</div>