Merge pull request #2 from j0narch3r/gh-pages

add mailchimp integration
Merge pull request #1 from j0narch3r/master

Landing Page for Artfactum
init rails
setup tests
Merge pull request #2 from Najtmare/master

Begin development
Add simpleform and annotate gem
Update Gemfile
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
Merge remote-tracking branch 'upstream/master'

Conflicts:
	assets/css/main.css
	index.html