Merge pull request #3 from Dipeshwagle/master

Add simpleform and annotate gem
add user signup/signin
add user signin/signup
add bourbon and dotenv
Merge pull request #4 from Najtmare/master

add user signup/signin
change copy for slug and one-liner in both English and Spanish
add font-smoothing
change button text formatting
change button formatting and copy
Merge remote-tracking branch 'upstream/master'

Conflicts:
	assets/css/main.css
	index.html
Merge pull request #6 from j0narch3r/master

70-slug-and-one-liner
add puma config and procfile
modify spanish translation on button, make button text uppercase
Merge pull request #7 from j0narch3r/master

modify spanish translation on button, make button text uppercase
Merge branch 'master' of https://github.com/asm-products/artfactum