Just some stuff for zarya
Merge branch 'master' of https://github.com/Fathalian/nestor

# By Zaryafaraj
# Via Zaryafaraj
* 'master' of https://github.com/Fathalian/nestor:
  no message
  drag is now functionally working. style still not applied

Conflicts:
	app/views/main.html
I very apologize