applying first stash - test
first check in
applying first stash - test
first check in
Merge branch 'master' into jamies
Merge remote-tracking branch 'origin/jamies' into sanels

Conflicts:
	branchadd.html
	learning.html
first check in
Merge branch 'jamies' into sanels

Conflicts:
	learning.html
first check in
Merge branch 'jamies' into sanels
Merge pull request #1 from huevosdeoro/sanels

Sanels