Merge pull request #1 from CQuIC-GitHub/dev

Some updated readme
Merge pull request #2 from CQuIC-GitHub/dev

Initial commit of the qcircuit tex files
Merge pull request #3 from CQuIC-GitHub/dev

Removed some files until permission could be granted
Merge pull request #4 from CQuIC-GitHub/dev

Dev
Turns out we needed a gitignore file.
Merge branch 'master' of github.com:CQuIC-GitHub/qcircuit
Update README.md

Move towards a consistent naming scheme, plus add a header in the README indicating which branch the README file corresponds to.
Merge branch 'dev'

Conflicts:
	.gitignore
	README.md
Merge pull request #10 from CQuIC-GitHub/dev

Dev
Merge pull request #11 from CQuIC-GitHub/dev

Update README.md
Merge pull request #12 from CQuIC-GitHub/master

Backwards merge into dev