Skip to content

Commit

Permalink
Merge pull request #5 from SpaceOtterInSpace/master
Browse files Browse the repository at this point in the history
Invasion of the SpaceOtters
  • Loading branch information
Ben Lavender committed Mar 4, 2015
2 parents beab9ae + cdf905a commit d8484e3
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 1 deletion.
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@

To run locally
*bundle install —binstubs
*bin/shotgun
Binary file added public/img/jacqui.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 6 additions & 1 deletion public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -140,11 +140,16 @@ <h2>Your Greeters</h2>
<img class="friendly-guy" src="/img/joe-square.jpg">
<p>Joe Ellis, the nice guy.</p>
</li>

</br>
<li>
<img class="friendly-guy" src="/img/joel-square.jpg">
<p>Joel Wietelmann, the other guy.</p>
</li>

<li>
<img class="friendly-guy" src="/img/jacqui.jpg">
<p>Jacqui Nelson, the not a guy guy.</p>
</li>
</ul>
</section>
</header>
Expand Down

0 comments on commit d8484e3

Please sign in to comment.