just flushing shit down the toilet
Merge branch 'master' of https://github.com/Fathalian/nestor

# By Zaryafaraj
# Via Zaryafaraj
* 'master' of https://github.com/Fathalian/nestor:
  no message
  style
  yeah
  changed nabber
  One big commit for basics of landing page.

Conflicts:
	app/views/main.html