Updated ng-FX.js dependency to ngFX.js due to update
Working on auth, added passport google stategy logic into config.js server file
added in passport.js and auth.js files for the google strategy
Continued implementing passport, added routing logic
Updated auth strategy - instead of sending 2 sets of static assests, we now have a public set of states and a private set (main) in the initial app thats served. Auth will take place just on requests for data sent from the client to the server. Upon login, users will be redirected to the main/home url
updated git repo files to be included in commits
began refactoring server side after updating client url heirarchy
Updated files in git repo
add package.json
working oauth connection with google!
getting ready to merge with development
Merge branch 'development' of https://github.com/mailcrunch/deployment into auth

Conflicts:
	client/auth/login/login.js
	client/auth/login/login.tpl.html
	server/main/app.js
	server/main/config.js
	server/main/middleware.js