Merge pull request #5 from UCSBGauchos/master

First commit
Merge pull request #6 from UCSBGauchos/master

Commit 2 home page
Merge pull request #7 from UCSBGauchos/master

Home page with sign up model
add file to commit
Merge branch 'master' of https://github.com/tracyyjy/CSSA_InfoPlatform

Conflicts:
	db/schema.rb

resolve conflict in db/schema version=>0 changed to version=>2013027055741
test local push pull
Begin of login
homepage changes
before merge gmy's push, sign up done with encrypt password
Sign in Function
Dropdown menu Fail
Sign in Finished without dropdown menu
-by Mengyuan Gu 10.28 12:07
sprint 2
Merge pull request #9 from gmy/master

Sprint 2 demo
update
Merge remote-tracking branch 'tracyyjy/master'

sprint 2
test push
new skeleton
Merge remote-tracking branch 'tracyyjy/master'

fetch