Skip to content

Commit

Permalink
Merge branches 'pr-853', 'pr-858', 'pr-859' and 'pr-861'
Browse files Browse the repository at this point in the history
  • Loading branch information
jlu5 committed Oct 15, 2017
5 parents 57a44aa + 033fdf0 + dbff2e1 + 1c775ba + f6fefc0 commit 3b0bd55
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 0 deletions.
9 changes: 9 additions & 0 deletions README.md
Expand Up @@ -183,3 +183,12 @@ hi
<br />
<figcaption>Anything goes elation.</figcaption>
</figure>

__ ____ ___ ______ _____
\ \ / /\ \ / / |/ / __ \| __ \
\ \ /\ / / \ \_/ /| ' / | | | |__) |
\ \/ \/ / \ / | <| | | | ___/
\ /\ / | | | . \ |__| | |
\/ \/ |_| |_|\_\____/|_|


1 change: 1 addition & 0 deletions code-and-data--cuz-code-is-data/HelloWorld.py
@@ -0,0 +1 @@
print "Hello World"
10 changes: 10 additions & 0 deletions code/HelloWorld.cpp
@@ -0,0 +1,10 @@
#include <iostream>
using namespace std;

int main()
{
cout << "Hello World" << endl;

return 0;

}
1 change: 1 addition & 0 deletions data/Anime
@@ -0,0 +1 @@
Anime is Life!!!!!!

0 comments on commit 3b0bd55

Please sign in to comment.