Merge pull request #31 from illWill2Survive/script

updated the script ..automatic flow #33
added sass setup to readme
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#	modified:   Gruntfile.js
#	modified:   app/app/app.js
#	modified:   app/index.html
#	modified:   package.json
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#	.sass-cache/
#	LICENSE
#	app.map.js
#	app/app/templates/about.html
#	app/css/
#	app/js/
Merge remote-tracking branch 'origin/master'
Merge pull request #32 from illWill2Survive/script

aesthetic
Merge pull request #33 from illWill2Survive/script

clean up and got rid of junk #32
added sass file
Merge remote-tracking branch 'origin/master'
fixed apis for year and make .. #7
Merge pull request #35 from illWill2Survive/api

fixed apis for year and make .. #7
added about page
Merge remote-tracking branch 'origin/master'
hard lesson in the diff of || and && #37