Merge pull request #84 from SterlingVix/master

another pre-deploy test
Deploy test 2
Merge branch 'master' of https://github.com/appception/appception into DeployTest2
Merge pull request #85 from SterlingVix/DeployTest2

Deploy test2 - just testing deployment stuff
WIP styling
Merge branch 'master' of https://github.com/appception/appception into styling

Conflicts:
	client/app/app.scss
	client/app/main/main.html
converted sass to stylus
Merge pull request #86 from kwalker3690/styling

(fix) converted sass to stylus
(fix) Restored the app.scss that I mistakely  deleted
(cleanup) update .gitignore
remove .DS_Store
(feat/makedrive) Add Nimble-related files
(feat/makedrive) First pass at adding Nimble to client and server.
(feat/makedrive) Use Nimble instead Brackets as the code editor
Merge pull request #88 from wykhuh/feat/makedrive

(Feat/makedrive) Use Nimble instead Brackets as the code editor
more WIP styling
Merge branch 'master' of https://github.com/appception/appception into styling
styling begun for home page and projects page
added time formatting to projects list
cleaned up navigation