Initial Commit
Merge remote-tracking branch 'upstream/master' into plove

Conflicts:
	app/scripts/main.js
	app/styles/main.scss
Institutes "span-columns" for widths
Merge pull request #3 from plove13x/plove

Plove