Typo / messing with git
Merge pull request #1 from findoo/master

Typo
website prepared for testing
includes a JS section where the members of the society can write their own functions
deleted unnecessary HTML paragraphs
modified the CSS with a new button class for the use of the scripts, and replaced some colors so it suits the NDS color scheme
This version of the website is ment to be used for github practice
Merge branch 'develop' of https://github.com/razvanilin/NapierDevSoc.github.io

Conflicts:
	index.html
	stylesheets/stylesheet.css
Merge branch 'master' of https://github.com/razvanilin/NapierDevSoc.github.io

Conflicts:
	index.html
Merge pull request #2 from razvanilin/master

Pull Request accepted.
Fix Typo - Params.JSON
Fixed some CSS ~issues~ (Made Buttons More Visible)
Adding Harry's Button
Merge pull request #3 from hreeder/master

Adding Harry's Button
Added a boring boring button
Fixed html comment tags and added btnGraham
Merge pull request #5 from GrahamWalters/master

Fixed html comment tags and added btnGraham
Merge branch 'master' of https://github.com/Chaos-Zero/NapierDevSoc.github.io into Chaos-Zero-master
(Added .gitignore)
Conflicts:
	index.html