Initial commit
adding jekyll structure
Merge pull request #1 from FilWisher/addingjekyllstructure

adding jekyll structure
adding jekyll structure
Merge pull request #2 from FilWisher/addingjekyllagain

adding jekyll structure
Create README.md
bootstrap set up
Merge pull request #3 from FilWisher/bootstrap

bootstrap set up
Update index.html
big stuff
merge
Merge branch 'bootstrap'

* bootstrap:
  big stuff

Conflicts:
	css/main.css
	index.html
new layout
Merge pull request #4 from FilWisher/newLayout

New layout
altering the descriptions of the technologies we use
Merge pull request #5 from FilWisher/alteringdescriptionsonindex

altering the descriptions of the technologies we use
added photos, altered styling on how we work, added some copy to how we work
Merge pull request #6 from FilWisher/editinghowwework

added photos, altered styling on how we work, added some copy to how we ...
editing how we work page
Merge pull request #7 from FilWisher/editinghowwework

editing how we work page