Browse files

Merge branch 'master' of github.com:BBFMedia/bbfmedia.github.com

Conflicts:
	.gitignore
  • Loading branch information...
2 parents 458303a + 2d279a1 commit ce12ac654e34cb807e4dc2ece003eb73b6eff49a @adrianj98 adrianj98 committed Sep 12, 2012
Showing with 5 additions and 2 deletions.
  1. +1 −2 .gitignore
  2. +4 −0 README.md
  3. 0 index.html
View
3 .gitignore
@@ -1,2 +1 @@
-
-/_site
+_site/
View
4 README.md
@@ -0,0 +1,4 @@
+bbfmedia.github.com
+===================
+
+BBF Media website
View
0 index.html
No changes.

0 comments on commit ce12ac6

Please sign in to comment.