ruby
first commit
adding
Added Module
Delete message
dfd
asd
df
Merge branch 'master' of https://github.com/anxsaiyuki/r-web

Conflicts:
	app/assets/javascripts/js/main.js
df
Merge branch 'master' of https://github.com/anxsaiyuki/r-web
added banner
Merge branch 'master' of https://github.com/anxsaiyuki/r-web
added main.js
Merge branch 'master' of https://github.com/anxsaiyuki/r-web
fix
df
fix top_bar
lo0gin
fix X image