Conflicts:
	README.md
This commit is contained in:
knsv
2014-12-22 13:58:30 +01:00
parent c50178c640
commit 83d9a3269e

2
.gitignore vendored
View File

@@ -3,3 +3,5 @@ bower_components/
*.sublime-project
*.sublime-workspace
.DS_Store
.idea
coverage