Skip to content

Commit

Permalink
Merge pull request #5 from Ylja/gh-pages
Browse files Browse the repository at this point in the history
Fixed #1
  • Loading branch information
richyvk authored Jun 1, 2017
2 parents 7562b63 + 2e5fb74 commit 9467754
Show file tree
Hide file tree
Showing 10 changed files with 81 additions and 871 deletions.
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// Place your settings in this file to overwrite default and user settings.
{
}
3 changes: 3 additions & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
Ylja Remmits
Richard Vankoningsveld
Petrina Collingwood
James Allen
Piotr Banaszkiewicz
Andy Boughton
Expand Down
7 changes: 1 addition & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,5 @@ for instructions on formatting, building, and submitting material,
or run `make` in this directory for a list of helpful commands.

Maintainer(s):
FIXME: Add maintainers

* [Bennet Fauber][fauber-bennet]
* [Greg Wilson][wilson-greg]

[fauber-bennet]: http://software-carpentry.org/team/#fauber_bennet
[lesson-example]: https://swcarpentry.github.com/lesson-example/
[wilson-greg]: http://software-carpentry.org/team/#wilson_g
70 changes: 70 additions & 0 deletions Untitled.ipynb
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
{
"cells": [
{
"cell_type": "markdown",
"metadata": {},
"source": []
},
{
"cell_type": "code",
"execution_count": 2,
"metadata": {
"collapsed": false
},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
"4\n"
]
}
],
"source": [
"x = 1\n",
"z =3\n",
"y = x+z\n",
"print(y)"
]
},
{
"cell_type": "code",
"execution_count": null,
"metadata": {
"collapsed": true
},
"outputs": [],
"source": []
},
{
"cell_type": "code",
"execution_count": null,
"metadata": {
"collapsed": true
},
"outputs": [],
"source": []
}
],
"metadata": {
"kernelspec": {
"display_name": "Python 3",
"language": "python",
"name": "python3"
},
"language_info": {
"codemirror_mode": {
"name": "ipython",
"version": 3
},
"file_extension": ".py",
"mimetype": "text/x-python",
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.6.0"
}
},
"nbformat": 4,
"nbformat_minor": 2
}
Loading

0 comments on commit 9467754

Please sign in to comment.