Skip to content

CAN I MERGE PLZ #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
thelinusgo wants to merge 7 commits into
base: master
Choose a base branch
from
Open

CAN I MERGE PLZ #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ee0f1b3
My name is Chris
chrisrabe Mar 22, 2016
61f6619
My name is Chris
chrisrabe Mar 22, 2016
456af5b
hegrfbsirbhseirgbesighbisrugnisgbiuesb
chrisrabe Mar 22, 2016
653c3e4
Chris
chrisrabe Mar 22, 2016
678e87c
oijdasnd
chrisrabe Mar 22, 2016
460764d
Added Description
chrisrabe May 5, 2016
d75378a
got a new photo
chrisrabe May 5, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 14 additions & 11 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<title>Hello, Summer of Talk!</title>
<title>My name is Chris</title>
<link href="https://fonts.googleapis.com/css?family=Open+Sans:400,700|Covered+By+Your+Grace" rel="stylesheet" type="text/css">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">
<link href="hello.css" rel="stylesheet" type="text/css">
Expand All @@ -13,22 +13,25 @@
</header>
<main>
<img src="me.png">
<h1>Your name here</h1>
<h1>Chris</h1>
<p>
Here's a good place to write a little bit about yourself.
Include anything you want people to know about you.
My name is Chris
</p>
<p>
Intelligentsia dreamcatcher chartreuse franzen sartorial ugh. Whatever
brunch asymmetrical tousled occupy before they sold out, distillery VHS
fingerstache salvia church-key readymade listicle. Craft beer skateboard
hella, hoodie brooklyn.
Welcome to the "My Name Is Chris" website! If you stumbled upon this website (by accident or not),
and you are extremely confused on why this abomination exists, no need to panic! This piece of paragraph
shall explain.
</p>
<p>
This website was created in git101 workshop of SoT. Everyone seemed to edit only two portions of the forked program. <br>
The description and the name. I decided to edit everything just to be unique and so that people who visit this site would
remember my name! Amazing isn't it?
</p>
<ul class="social">

<li><a rel="github" href="http://github.com/powershop">My code</a></li>
<li><a rel="home" href="http://example.com">My website</a></li>
<li><a rel="twitter" href="http://twitter.com/powershop">@powershop</a></li>
<li><a rel="github" href="http://github.com/chrisrabe">My name is Chris</a></li>
<li><a rel="home" href="http://github.com/chrisrabe">My name is Chris</a></li>
<li><a rel="twitter" href="http://github.com/chrisrabe">My name is Chris</a></li>
</ul>
</main>
<footer>
Expand Down
Binary file modified me.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.