diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000000..346945c5877 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +.DS_Store +*.xlsx +*.log +log/ +*.orig diff --git a/README.md b/README.md index 06bb023212b..9034d37049c 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,32 @@ -# Starter Web Repo +# Starter Web Project -This repository is for showing how Git and GitHub work +Edit form feature branch to view diff + +C2 Edit form feature branch to view diff + + +This is a simple website project for showing how to use Git and Github together. +Emergency fix + +C1 en master +C2 en myfeature + +## Introduction +This is an example to show different parts of the Git repository and various commands using a ewb project. ## Purpose -Sample website with plenty of files for demos \ No newline at end of file +As stated above, the main purpose is to provide simple examples for Git training demos. + +## Deployment + +This a simple web project, deployment can be on any web server or even local file system. + +## How To Contribute + +Pleasy fork this repository + +### Copyright + +2014 Git.Training. 2 +C1 master after stash diff --git a/humans.txt b/humans.txt index 5b037cf2e10..fd6ce6a0021 100644 --- a/humans.txt +++ b/humans.txt @@ -3,13 +3,14 @@ # TEAM - -- -- + Json Tylor # THANKS - + Please leave a review # TECHNOLOGY COLOPHON HTML5, CSS3 jQuery, Modernizr + Stash branch ej en file humans diff --git a/index.html b/index.html index 01f983f454c..71fbd6a20ca 100644 --- a/index.html +++ b/index.html @@ -6,7 +6,7 @@ - + Tagging example @@ -45,7 +45,7 @@
- + diff --git a/simple.html b/simple.html index ca5e908d98f..c7a56a1df45 100644 --- a/simple.html +++ b/simple.html @@ -1,6 +1,9 @@ + - + Update for tagging compare example