Commit 82ec3220 authored by Adam Procter's avatar Adam Procter

Merge branch 'more-stuff' into 'master'

More stuff

See merge request !2
parents 5b25609c 67d3a557
*.un~
*.swp
......@@ -6,10 +6,10 @@ Focus on general use for artists, designers and coders within a games project.
This is a new line
Here's another line
The terminal is so great. So is vim.
## Software
This workshop is run in year 3 with students and so we will introduce the [github Student Backpack](https://education.github.com/pack) which includes the application Gitkrakin Pro free for a year for PC & Mac. Gitkrakin (not Pro) is also free with some limitation
## Art
Please use only cool photos in the img folder.
\ No newline at end of file
Please use only cool photos in the img folder.
This is another file.
IT is so great.
Text goes here
And amazing code
Oh this one is crucial.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment