add files to skeleton
Merge branch 'master' of https://github.com/shaunmcgeever/thedelta into chore/category_functions
Login features complete
Merge branch 'master' of https://github.com/fiddler-crabs-2014/thedelta
added tests
login page fixed
Merge pull request #14 from Adrian-Pask/Fix/login-page

Fix/login page
Merge `ranch 'master' into chore/category_functions
add category views,controller,seed data, and basic question functionality
Merge pull request #15 from shaunmcgeever/chore/category_functions

Chore/category functions
change layout link
Merge pull request #16 from shaunmcgeever/chore/category_functions

change layout link
Merge branch 'master' into chore/homepage-js
home page working and redirecting to categories with correct start and end languages