added session based login/logout
added cookies for login and remember me on login function
added session based login/logout
added cookies for login and remember me on login function
added session based login/logout
added cookies for login and remember me on login function
Merge branch 'login' of https://github.com/SovietWinter/667-Group-F into login
markdown post

is this right? just let me know!
seed data
Merge branch 'master' into tyler-working

Conflicts:
	Gemfile
	Gemfile.lock
	config/routes.rb
merge cleanup
ditch scss. basic angular app sucess