Merge branch 'SCSS-branch'

Conflicts:
	.tmp/styles/main.css
	app/index.html
	app/styles/bootstrap.scss
	app/styles/main.scss
	dist/styles/main.css
	gulpfile.js

node_modules/gulp-ruby-sass/node_modules/chalk/node_modules/ansi-styles/
package.json

node_modules/gulp-ruby-sass/node_modules/chalk/node_modules/escape-strin
g-regexp/package.json

node_modules/gulp-ruby-sass/node_modules/chalk/node_modules/has-ansi/nod
e_modules/ansi-regex/package.json

node_modules/gulp-ruby-sass/node_modules/chalk/node_modules/has-ansi/pac
kage.json

node_modules/gulp-ruby-sass/node_modules/chalk/node_modules/strip-ansi/n
ode_modules/ansi-regex/package.json

node_modules/gulp-ruby-sass/node_modules/chalk/node_modules/strip-ansi/p
ackage.json

node_modules/gulp-ruby-sass/node_modules/chalk/node_modules/supports-col
or/package.json
	node_modules/gulp-ruby-sass/node_modules/chalk/package.json
	node_modules/gulp-ruby-sass/node_modules/dargs/package.json
	node_modules/gulp-ruby-sass/node_modules/each-async/package.json

node_modules/gulp-ruby-sass/node_modules/glob/node_modules/graceful-fs/p
ackage.json

node_modules/gulp-ruby-sass/node_modules/glob/node_modules/inherits/pack
age.json

node_modules/gulp-ruby-sass/node_modules/glob/node_modules/minimatch/nod
e_modules/lru-cache/package.json

node_modules/gulp-ruby-sass/node_modules/glob/node_modules/minimatch/nod
e_modules/sigmund/package.json

node_modules/gulp-ruby-sass/node_modules/glob/node_modules/minimatch/pac
kage.json

node_modules/gulp-ruby-sass/node_modules/glob/node_modules/once/node_mod
ules/wrappy/package.json

node_modules/gulp-ruby-sass/node_modules/glob/node_modules/once/package.
json
	node_modules/gulp-ruby-sass/node_modules/glob/package.json

node_modules/gulp-ruby-sass/node_modules/gulp-intermediate/node_modules/
gulp-util/node_modules/dateformat/package.json

node_modules/gulp-ruby-sass/node_modules/gulp-intermediate/node_modules/
gulp-util/node_modules/lodash._reinterpolate/package.json

node_modules/gulp-ruby-sass/node_modules/gulp-intermediate/node_modules/
gulp-util/node_modules/lodash.template/node_modules/lodash._escapestring
char/package.json

node_modules/gulp-ruby-sass/node_modules/gulp-intermediate/node_modules/
gulp-util/node_modules/lodash.template/node_modules/lodash.defaults/node
_modules/lodash._objecttypes/package.json

node_modules/gulp-ruby-sass/node_modules/gulp-intermediate/node_modules/
gulp-util/node_modules/lodash.template/node_modules/lodash.defaults/pack
age.json

node_modules/gulp-ruby-sass/node_modules/gulp-intermediate/node_modules/
gulp-util/node_modules/lodash.template/node_modules/lodash.escape/node_m
odules/lodash._escapehtmlchar/node_modules/lodash._htmlescapes/package.j
son

node_modules/gulp-ruby-sass/node_modules/gulp-intermediate/node_modules/
gulp-util/node_modules/lodash.template/node_modules/lodash.escape/node_m
odules/lodash._escapehtmlchar/package.json

node_modules/gulp-ruby-sass/node_modules/gulp-intermediate/node_modules/
gulp-util/node_modules/lodash.template/node_modules/lodash.escape/node_m
odules/lodash._reunescapedhtml/node_modules/lodash._htmlescapes/package.
json

node_modules/gulp-ruby-sass/node_modules/gulp-intermediate/node_modules/
gulp-util/node_modules/lodash.template/node_modules/lodash.escape/node_m
odules/lodash._reunescapedhtml/package.json

node_modules/gulp-ruby-sass/node_modules/gulp-intermediate/node_modules/
gulp-util/node_modules/lodash.template/node_modules/lodash.escape/packag
e.json

node_modules/gulp-ruby-sass/node_modules/gulp-intermediate/node_modules/
gulp-util/node_modules/lodash.template/node_modules/lodash.keys/node_mod
ules/lodash._isnative/package.json

node_modules/gulp-ruby-sass/node_modules/gulp-intermediate/node_modules/
gulp-util/node_modules/lodash.template/node_modules/lodash.keys/node_mod
ules/lodash._shimkeys/node_modules/lodash._objecttypes/package.json

node_modules/gulp-ruby-sass/node_modules/gulp-intermediate/node_modules/
gulp-util/node_modules/lodash.template/node_modules/lodash.keys/node_mod
ules/lodash._shimkeys/package.json

node_modules/gulp-ruby-sass/node_modules/gulp-intermediate/node_modules/
gulp-util/node_modules/lodash.template/node_modules/lodash.keys/node_mod
ules/lodash.isobject/node_modules/lodash._objecttypes/package.json

node_modules/gulp-ruby-sass/node_modules/gulp-intermediate/node_modules/
gulp-util/node_modules/lodash.template/node_modules/lodash.keys/node_mod
ules/lodash.isobject/package.json

node_modules/gulp-ruby-sass/node_modules/gulp-intermediate/node_modules/
gulp-util/node_modules/lodash.template/node_modules/lodash.keys/package.
json

node_modules/gulp-ruby-sass/node_modules/gulp-intermediate/node_modules/
gulp-util/node_modules/lodash.template/node_modules/lodash.templatesetti
ngs/package.json

node_modules/gulp-ruby-sass/node_modules/gulp-intermediate/node_modules/
gulp-util/node_modules/lodash.template/node_modules/lodash.values/packag
e.json

node_modules/gulp-ruby-sass/node_modules/gulp-intermediate/node_modules/
gulp-util/node_modules/lodash.template/package.json

node_modules/gulp-ruby-sass/node_modules/gulp-intermediate/node_modules/
gulp-util/node_modules/minimist/package.json

node_modules/gulp-ruby-sass/node_modules/gulp-intermediate/node_modules/
gulp-util/node_modules/multipipe/Readme.md

node_modules/gulp-ruby-sass/node_modules/gulp-intermediate/node_modules/
gulp-util/node_modules/multipipe/node_modules/duplexer2/node_modules/rea
dable-stream/node_modules/core-util-is/package.json

node_modules/gulp-ruby-sass/node_modules/gulp-intermediate/node_modules/
gulp-util/node_modules/multipipe/node_modules/duplexer2/node_modules/rea
dable-stream/node_modules/inherits/package.json

node_modules/gulp-ruby-sass/node_modules/gulp-intermediate/node_modules/
gulp-util/node_modules/multipipe/node_modules/duplexer2/node_modules/rea
dable-stream/node_modules/string_decoder/package.json

node_modules/gulp-ruby-sass/node_modules/gulp-intermediate/node_modules/
gulp-util/node_modules/multipipe/node_modules/duplexer2/node_modules/rea
dable-stream/package.json

node_modules/gulp-ruby-sass/node_modules/gulp-intermediate/node_modules/
gulp-util/node_modules/multipipe/package.json

node_modules/gulp-ruby-sass/node_modules/gulp-intermediate/node_modules/
gulp-util/node_modules/vinyl/node_modules/clone-stats/package.json

node_modules/gulp-ruby-sass/node_modules/gulp-intermediate/node_modules/
gulp-util/node_modules/vinyl/package.json

node_modules/gulp-ruby-sass/node_modules/gulp-intermediate/node_modules/
gulp-util/package.json

node_modules/gulp-ruby-sass/node_modules/gulp-intermediate/node_modules/
rimraf/package.json

node_modules/gulp-ruby-sass/node_modules/gulp-intermediate/node_modules/
through2/node_modules/readable-stream/node_modules/core-util-is/package.
json

node_modules/gulp-ruby-sass/node_modules/gulp-intermediate/node_modules/
through2/node_modules/readable-stream/node_modules/inherits/package.json

node_modules/gulp-ruby-sass/node_modules/gulp-intermediate/node_modules/
through2/node_modules/readable-stream/node_modules/string_decoder/packag
e.json

node_modules/gulp-ruby-sass/node_modules/gulp-intermediate/node_modules/
through2/node_modules/readable-stream/package.json

node_modules/gulp-ruby-sass/node_modules/gulp-intermediate/node_modules/
through2/node_modules/xtend/package.json

node_modules/gulp-ruby-sass/node_modules/gulp-intermediate/node_modules/
through2/package.json

node_modules/gulp-ruby-sass/node_modules/gulp-intermediate/node_modules/
uuid/package.json
	node_modules/gulp-ruby-sass/node_modules/gulp-intermediate/package.json

node_modules/gulp-ruby-sass/node_modules/gulp-util/node_modules/dateform
at/package.json

node_modules/gulp-ruby-sass/node_modules/gulp-util/node_modules/lodash._
reinterpolate/package.json

node_modules/gulp-ruby-sass/node_modules/gulp-util/node_modules/lodash.t
emplate/node_modules/lodash._escapestringchar/package.json

node_modules/gulp-ruby-sass/node_modules/gulp-util/node_modules/lodash.t
emplate/node_modules/lodash.defaults/node_modules/lodash._objecttypes/pa
ckage.json

node_modules/gulp-ruby-sass/node_modules/gulp-util/node_modules/lodash.t
emplate/node_modules/lodash.defaults/package.json

node_modules/gulp-ruby-sass/node_modules/gulp-util/node_modules/lodash.t
emplate/node_modules/lodash.escape/node_modules/lodash._escapehtmlchar/n
ode_modules/lodash._htmlescapes/package.json

node_modules/gulp-ruby-sass/node_modules/gulp-util/node_modules/lodash.t
emplate/node_modules/lodash.escape/node_modules/lodash._escapehtmlchar/p
ackage.json

node_modules/gulp-ruby-sass/node_modules/gulp-util/node_modules/lodash.t
emplate/node_modules/lodash.escape/node_modules/lodash._reunescapedhtml/
node_modules/lodash._htmlescapes/package.json

node_modules/gulp-ruby-sass/node_modules/gulp-util/node_modules/lodash.t
emplate/node_modules/lodash.escape/node_modules/lodash._reunescapedhtml/
package.json

node_modules/gulp-ruby-sass/node_modules/gulp-util/node_modules/lodash.t
emplate/node_modules/lodash.escape/package.json

node_modules/gulp-ruby-sass/node_modules/gulp-util/node_modules/lodash.t
emplate/node_modules/lodash.keys/node_modules/lodash._isnative/package.j
son

node_modules/gulp-ruby-sass/node_modules/gulp-util/node_modules/lodash.t
emplate/node_modules/lodash.keys/node_modules/lodash._shimkeys/node_modu
les/lodash._objecttypes/package.json

node_modules/gulp-ruby-sass/node_modules/gulp-util/node_modules/lodash.t
emplate/node_modules/lodash.keys/node_modules/lodash._shimkeys/package.j
son

node_modules/gulp-ruby-sass/node_modules/gulp-util/node_modules/lodash.t
emplate/node_modules/lodash.keys/node_modules/lodash.isobject/node_modul
es/lodash._objecttypes/package.json

node_modules/gulp-ruby-sass/node_modules/gulp-util/node_modules/lodash.t
emplate/node_modules/lodash.keys/node_modules/lodash.isobject/package.js
on

node_modules/gulp-ruby-sass/node_modules/gulp-util/node_modules/lodash.t
emplate/node_modules/lodash.keys/package.json

node_modules/gulp-ruby-sass/node_modules/gulp-util/node_modules/lodash.t
emplate/node_modules/lodash.templatesettings/package.json

node_modules/gulp-ruby-sass/node_modules/gulp-util/node_modules/lodash.t
emplate/node_modules/lodash.values/package.json

node_modules/gulp-ruby-sass/node_modules/gulp-util/node_modules/lodash.t
emplate/package.json

node_modules/gulp-ruby-sass/node_modules/gulp-util/node_modules/lodash/p
ackage.json

node_modules/gulp-ruby-sass/node_modules/gulp-util/node_modules/minimist
/package.json

node_modules/gulp-ruby-sass/node_modules/gulp-util/node_modules/multipip
e/Readme.md

node_modules/gulp-ruby-sass/node_modules/gulp-util/node_modules/multipip
e/node_modules/duplexer2/node_modules/readable-stream/node_modules/core-
util-is/package.json

node_modules/gulp-ruby-sass/node_modules/gulp-util/node_modules/multipip
e/node_modules/duplexer2/node_modules/readable-stream/node_modules/inher
its/package.json

node_modules/gulp-ruby-sass/node_modules/gulp-util/node_modules/multipip
e/node_modules/duplexer2/node_modules/readable-stream/node_modules/strin
g_decoder/package.json

node_modules/gulp-ruby-sass/node_modules/gulp-util/node_modules/multipip
e/node_modules/duplexer2/node_modules/readable-stream/package.json

node_modules/gulp-ruby-sass/node_modules/gulp-util/node_modules/multipip
e/package.json

node_modules/gulp-ruby-sass/node_modules/gulp-util/node_modules/through2
/node_modules/readable-stream/node_modules/core-util-is/package.json

node_modules/gulp-ruby-sass/node_modules/gulp-util/node_modules/through2
/node_modules/readable-stream/node_modules/inherits/package.json

node_modules/gulp-ruby-sass/node_modules/gulp-util/node_modules/through2
/node_modules/readable-stream/node_modules/string_decoder/package.json

node_modules/gulp-ruby-sass/node_modules/gulp-util/node_modules/through2
/node_modules/readable-stream/package.json

node_modules/gulp-ruby-sass/node_modules/gulp-util/node_modules/through2
/package.json

node_modules/gulp-ruby-sass/node_modules/gulp-util/node_modules/vinyl/no
de_modules/clone-stats/package.json

node_modules/gulp-ruby-sass/node_modules/gulp-util/node_modules/vinyl/pa
ckage.json
	node_modules/gulp-ruby-sass/node_modules/gulp-util/package.json
	node_modules/gulp-ruby-sass/node_modules/slash/package.json
	node_modules/gulp-ruby-sass/node_modules/win-spawn/package.json
	node_modules/gulp-ruby-sass/package.json