//hold onto your butts
Merge branch 'master' of https://github.com/mpn3712/Graphtacular.js

Conflicts:
	index.html