migrating from final-bootstrap, plus weather api
added fireside chat
streamlined, new style
responsiveness tweaks
carousel indicator fix
added copy
Update after NSS graduation
Added bootstrap responsive file
Add WordPress link in carousel
Trimmed fat of unused options
Tidying up directories
Delete fireside-710-474.png
Merge branch 'master' of https://github.com/JamesNix/portfolio

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/JamesNix/portfolio
adding media
Committing on VM before pulling down changes
Merge branch 'master' of https://github.com/JamesNix/portfolio
merging tweaks after VM reboot
Conflicts:
	app/index.jade
	public/about.html
	public/index.html
Adding about and index html
Merge branch 'master' of https://github.com/JamesNix/portfolio
Merging responsiveness improvements
Conflicts:
	public/about.html