initial commit
Version Added
Issue #6 Event Model Added
Issue #6 Event Model Added
secret_token
merge
Merge branch 'develop' of github.com:ab2014-rails/elmas into develop
#4 add admin profile model
Merge branch 'develop' of github.com:ab2014-rails/elmas into develop

Conflicts:
	config/routes.rb
	db/schema.rb
#6 Events Added
merge
#5
#6 Tr Lang Added
Merge branch 'develop' of github.com:ab2014-rails/elmas into develop
merge
Merge branch 'develop' of github.com:ab2014-rails/elmas into develop
merge
Merge branch 'develop' of github.com:ab2014-rails/elmas into develop
fixed
fix routes