Merge initial template into master