Consistent use of single (js) / double (html) quotes.
Conventional capitalization of controllers (being constructors).
merge
Troubleshooting possible cookie error.
Merge branch 'master' of https://github.com/MovieBuddy/moviebuddy
Further corrections to controller capitalizations.
Merged and confirmed working copy.

Merge branch 'master' of https://github.com/MovieBuddy/moviebuddy

Conflicts:
	app/views/login.html
Merge pull request #23 from janaspage/master

Several minor changes for convention.
Merge branch 'master' of https://github.com/MovieBuddy/moviebuddy

Conflicts:
	app/scripts/app.js
Merge branch 'master' of https://github.com/MovieBuddy/moviebuddy

Conflicts:
	app/scripts/app.js
	app/scripts/controllers/movies.js
Merge branch 'master' of https://github.com/JoshSGman/moviebuddy_ into JoshSGman-master

Conflicts:
	app/scripts/controllers/movies.js
editable profile fields