Permalink
Browse files

Merge branch 'master' into dev

  • Loading branch information...
carlrafting committed Feb 14, 2014
2 parents 903ed9b + 99123f8 commit 7123bb3197ed7298b6d12a5ac8d561200130a048
View
@@ -0,0 +1,6 @@
+[submodule "autogrow"]
+ path = autogrow
+ url = https://github.com/carlrafting/autogrow.git
+[submodule "designgrid"]
+ path = designgrid
+ url = https://github.com/carlrafting/designgrid.git
@@ -10,6 +10,6 @@ Before i used "#grid":http://hashgrid.com, by the folks at "Analog":http://analo
My goal was to get something out there as quickly as possible, and worry about optimization and performance later. All in all i spent about a week to get to where i am now, i designed the grid layout and some basic script functionality the first day. Following days was spent on code for generating a baseline grid and columns.
-h2. Check it out!
+<hr class="divider">
-You can "check out more about the project and how to set up the grid":/designGrid/, and then "download the code from Github":https://github.com/carlrafting/designGrid.
+You can "check out more about the project and how to set up the grid":/designgrid/, and then "download the code from Github":https://github.com/carlrafting/designgrid.
@@ -17,4 +17,4 @@ Last year around this time, i spent about two and a half months helping out the
<hr class="divider">
-A lot of time the past year, has been devoted to studies. Now i only have a few months left of my "education":http://www.jenseneducation.se/JENSEN-yrkeshogskola/. One more period, three months, of work practice left then i'm done with my studies… For now. I'm hoping i can get back to working again. I've learned a lot since last time when "i worked at nodestar":http://nodestar.se, so there's a lot more i can do now.
+A lot of time the past year, has been devoted to studies. Now i only have a few months left of my "education":http://www.jenseneducation.se/JENSEN-yrkeshogskola/. One more period, three months of internship left then i'm done with my studies… For now. I'm hoping i can get back to working again. I've learned a lot since last time when "i worked at nodestar":http://nodestar.se, so there's a lot more i can do now.

0 comments on commit 7123bb3

Please sign in to comment.