Merge branch 'master' of https://bitbucket.org/idealcoder/yrs-2013

Conflicts: README.md
Idealcoder · Aug 4, 2013 · 220dc30 · 220dc30
2 parents 2425355 + de14f38
commit 220dc30
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -1,4 +1,5 @@
 YRS-2013
 ========
 
-What else can I say?
+This is the repo for our undecided project. It has been setup to sync with a laptop running debian (apache2,php5 + mysql) so changes will be pushed automatically
+